Sabe Jones beb86ea4bd Merge branch 'khipkin/party-badges' into develop ...

Conflicts:
	common/dist/sprites/spritesmith-main-10.png
	common/dist/sprites/spritesmith-main-11.png
	common/dist/sprites/spritesmith-main-5.css
	common/dist/sprites/spritesmith-main-5.png
	common/dist/sprites/spritesmith-main-6.png
	common/dist/sprites/spritesmith-main-7.png
	common/dist/sprites/spritesmith-main-8.png
	common/dist/sprites/spritesmith-main-9.png

2016-03-15 14:57:38 -04:00

..

main

Adjust PR #5389

2015-06-12 09:05:06 -05:00

options

Changed tavern tier 1 text icon

2016-03-08 03:05:46 -03:00

shared

Merge branch 'khipkin/party-badges' into develop

2016-03-15 14:57:38 -04:00

social

Adds a variable to manage user count

2016-01-16 11:11:48 +01:00

static

#6779 Update community-guidelines.jade with current date

2016-02-28 01:20:31 -08:00

avatar-static.jade

add TODO comments, send mods to client as they are used there

2015-08-14 21:05:04 +02:00

index.jade

Add icon for pinned Safari tabs

2016-01-14 20:32:51 -06:00