Sabe Jones 2848f5d709 Merge branch 'NathanMaton/fix-homepage-text' into develop ...

Conflicts:
	common/dist/sprites/habitrpg-shared.css

2016-01-19 13:59:49 -05:00

..

public

add new emails images

2016-01-19 18:30:57 +01:00

src

change habitrpg to habitica for PayPal subscription config

2016-01-14 03:08:16 +10:00

views

Merge branch 'NathanMaton/fix-homepage-text' into develop

2016-01-19 13:59:49 -05:00