Negue 1cc07129f1 Merge branch 'develop' into pushNotifications2 ...

Conflicts:
	test/api.mocha.coffee

2015-05-10 22:01:41 +02:00

..

public

remove growl notification about party settings saved after changing party order (not needed now that avatars in head are resorted immediately)

2015-03-22 17:50:22 +10:00

content.coffee

feat(backgrounds): May BGs

2015-05-06 19:41:54 -05:00

i18n.coffee

Repair Broken Test Suite - Full Passing Tests

2015-03-24 21:39:03 -04:00

index.coffee

Merge branch 'develop' into pushNotifications2

2015-05-10 22:01:41 +02:00