Merge remote-tracking branch 'origin/pro' into pro
Conflicts: src/test/test-main.js
Showing
src/app/controllers/p_grafanaCtrl.js
0 → 100644
src/app/controllers/p_loginCtrl.js
0 → 100644
src/app/p_app.js
0 → 100644
src/app/partials/pro/admin_datasources.html
0 → 100644
src/app/partials/pro/dashboard_topnav.html
0 → 100644
src/app/partials/pro/login.html
0 → 100644
src/app/partials/pro/sidemenu.html
0 → 100644
src/app/routes/p_admin.js
0 → 100644
src/app/routes/p_all.js
0 → 100644
src/app/routes/p_dashboard.js
0 → 100644
src/app/routes/p_login.js
0 → 100644
src/css/less/p_pro.less
0 → 100644
src/img/logo_transparent_200x75.png
0 → 100644
8.7 KB
src/img/logo_transparent_400x.png
0 → 100644
19.3 KB
Please
register
or
sign in
to comment