diff options
| author | Michael <[email protected]> | 2017-04-11 09:58:39 -0400 |
|---|---|---|
| committer | Michael <[email protected]> | 2017-04-11 09:58:39 -0400 |
| commit | ad3003121a84c8f0ea8da35d97711bec82a6b9b2 (patch) | |
| tree | b836277c0f5754632c83181a45a4638d223a1bf5 | |
| parent | 62f222181c592754b9090749b50c4fe481f10423 (diff) | |
| parent | ece703487723ec806bf306dff2d27910b1b6d4e2 (diff) | |
| download | project-unite-ad3003121a84c8f0ea8da35d97711bec82a6b9b2.tar.gz project-unite-ad3003121a84c8f0ea8da35d97711bec82a6b9b2.tar.bz2 project-unite-ad3003121a84c8f0ea8da35d97711bec82a6b9b2.zip | |
Merge remote-tracking branch 'origin/master'
# Conflicts:
# Project-Unite/Controllers/AccountController.cs
| -rw-r--r-- | Project-Unite/Controllers/AccountController.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Project-Unite/Controllers/AccountController.cs b/Project-Unite/Controllers/AccountController.cs index 453acb9..a80639d 100644 --- a/Project-Unite/Controllers/AccountController.cs +++ b/Project-Unite/Controllers/AccountController.cs @@ -520,4 +520,4 @@ The addressed used to send this message is not a no-reply address. In fact, my n } #endregion } -}
\ No newline at end of file +} |