Merge branch 'master' into pluginlist

This commit is contained in:
Torkel Ödegaard committed 2016-04-09 15:01:39 -04:00
commit 12800f831a
16 files changed
+90 -47

No files matched your search

+1
View File
@@ -30,6 +30,7 @@ func Register(r *macaron.Macaron) {
// authed views
r.Get("/profile/", reqSignedIn, Index)
r.Get("/profile/password", reqSignedIn, Index)
r.Get("/profile/switch-org/:id", reqSignedIn, ChangeActiveOrgAndRedirectToHome)
r.Get("/org/", reqSignedIn, Index)
r.Get("/org/new", reqSignedIn, Index)
r.Get("/datasources/", reqSignedIn, Index)