shiftos-archive/Project-Unite
1
0
Fork 0
mirror of https://github.com/lempamo/Project-Unite.git synced 2025-01-22 17:22:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master'

Browse source 
# Conflicts:
#	Project-Unite/Controllers/AccountController.cs
This commit is contained in:
Michael 2017-04-11 09:58:39 -04:00
commit ad3003121a
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Project-Unite/Controllers/AccountController.cs
View file

@ -520,4 +520,4 @@ public override void ExecuteResult(ControllerContext context)
}
#endregion
}
}
}