Merge remote-tracking branch 'origin/dev' into dev

# Conflicts: # src/bootstrap.php
2017-02-23 15:35:10 +01:00
parent caa567d963 36caeccb74
commit 10c8093ed5
7 changed files with 162 additions and 28 deletions
--- a/src/Application/Login.php
+++ b/src/Application/Login.php
@ -12,7 +12,7 @@
 *  Jelmer Hinssen
 */

-namespace InfD4p\Application;
+namespace Inforbank\Application;

 use \Slim\App;