Matteo Pagliazzi a947afa5c6 Merge branch 'develop' into api-v3		2016-05-11 14:36:58 +02:00
..
api	switch from Q to Bluebird	2016-05-11 14:34:01 +02:00
api-legacy	switch from Q to Bluebird	2016-05-11 14:34:01 +02:00
common	Sabrecat/glasses chairs (#7182)	2016-05-10 16:07:46 -05:00
common_old	Merge branch 'develop' into api-v3	2016-05-11 14:36:58 +02:00
content	Revert "Revert inventory equipment/gear sorting due to inability to de/equip and maybe performance issues."	2016-03-17 08:09:18 -05:00
e2e	lint: Add missing semicolon to test helper	2016-03-13 22:06:09 -05:00
helpers	switch from Q to Bluebird	2016-05-11 14:34:01 +02:00
migrations	Add rudimentary test for migration script	2015-06-05 13:12:38 -05:00
server_side	switch from Q to Bluebird	2016-05-11 14:34:01 +02:00
spec	feat: Switch out js-emoji for habtiica-markdown	2016-04-26 08:19:47 -05:00
.eslintrc	chore: merge in develop	2016-04-15 10:11:54 -05:00
mocha.opts	Merge branch 'develop' into api-v3	2016-03-04 12:16:22 -06:00