Hannah Wolfe 1590a424ef Merge branch 'promises' of github.com:tgriesser/Ghost into tgriesser-promises ... Conflicts: core/shared/models/dataProvider.bookshelf.users.js		2013-05-26 19:44:34 +01:00
..
assets	Merge changes from upstream	2013-05-25 11:55:23 -05:00
controllers	Merge branch 'promises' of github.com:tgriesser/Ghost into tgriesser-promises	2013-05-26 19:44:34 +01:00
views	Fixing bug in registration	2013-05-26 12:38:14 +00:00