Commit Graph

2 Commits

Author SHA1 Message Date
Matias Griese
9c4bc41bd6 Add missing templates (placeholders) 2014-09-09 07:58:19 +03:00
Matias Griese
ff001b3dbc Merge branch 'feature/login-separation' of bitbucket.org:rockettheme/grav-plugin-admin into feature/redesign
Conflicts:
	admin.php
	admin.yaml
	pages/admin/login.md
	pages/admin/themes.md
2014-09-09 07:57:53 +03:00