Merge branch 'develop' into release · ca2f2ba9ce - habitica - Gitea: Git with a cup of tea

Kai/habitica

Merge branch 'develop' into release

This commit is contained in:

Sabe Jones

2019-02-14 13:39:52 -06:00

parent 165ca8737b b711c1672b

commit ca2f2ba9ce

490 changed files with 3540 additions and 3424 deletions

									
										website/client/assets/scss/index.scss
									
		+1
		
												View File
												
				@@ -35,3 +35,4 @@

				@import './pin';

				@import './animals';

				@import './iconalert';

				@import './tiers';