diff options
| author | EoleDev <EoleDev@outlook.fr> | 2016-03-23 14:43:27 +0100 |
|---|---|---|
| committer | EoleDev <EoleDev@outlook.fr> | 2016-03-23 14:43:27 +0100 |
| commit | d3fc2ab36ced70c8eb20e7f85f900425b7781667 (patch) | |
| tree | e325f9dce61a176e5a1d5585461ddd19c668b5fd /client/js/app.js | |
| parent | a26989103d70fb0dd3ff6834de107cae246778c3 (diff) | |
| parent | f9643dd9ffeec5eda4f563dd695135ac3a681d60 (diff) | |
Merge branch 'Eole' into develop
Conflicts:
client/js/controllers/home/home.js
Diffstat (limited to 'client/js/app.js')
| -rw-r--r-- | client/js/app.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/js/app.js b/client/js/app.js index 1602e65..a26e0ec 100644 --- a/client/js/app.js +++ b/client/js/app.js @@ -24,7 +24,7 @@ mainApp.config(['$routeProvider', function($routeProvider){ templateUrl: 'partials/image/image.html', controller: 'imageCtrl' }).otherwise({ - redirectTo: '/home' + redirectTo: '/' }); }]); |