Commit Graph

4 Commits

Author SHA1 Message Date
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
Jacob Gable
9ec2396213 Fix JSLInt errors and port existing nodeunit tests to mocha 2013-05-26 12:34:05 -05:00
Tim Griesser
2cad866734 adding bourbon to gitignore 2013-05-26 13:10:59 -04:00
Hannah Wolfe
17d421bfcc Initial commit to GitHub repo 2013-05-11 17:44:25 +01:00