Hannah Wolfe b3775feba0 Merge branch 'pr/119' ... Conflicts: core/admin/assets/js/router.js core/admin/views/default.hbs core/admin/views/settings.hbs core/shared/data/fixtures/001.js		2013-06-09 21:41:07 +01:00
..
base.js	simplifying the model structure, again	2013-06-01 11:14:05 -04:00
index.js	Changes to Settings Model	2013-06-08 19:24:21 -03:00
permission.js	Permissions / ACL	2013-06-06 08:15:10 +01:00
post.js	Implement a permissable interface on models	2013-06-08 18:39:24 -05:00
role.js	Permissions / ACL	2013-06-06 08:15:10 +01:00
settings.js	Changes to Settings Model	2013-06-08 19:24:21 -03:00
user.js	Permissions / ACL	2013-06-06 08:15:10 +01:00