2 commits

Author	SHA1	Message	Date
Hannah Wolfe	79a333b480	Merge branch 'master' into ember ... Conflicts: bower.json core/client/views/editor.js	2014-03-16 20:52:44 +00:00
Hannah Wolfe	bee58922b2	Rename client -> clientold ... issue #2271 - should allow development of new admin UI whilst still having access to the old ui	2014-02-27 00:52:04 +00:00