Sabe Jones 27e3797307 Merge branch 'develop' into sabrecat/more-modals ...

Conflicts:
	common/locales/en/challenge.json

2015-10-28 14:54:55 -04:00

..

main

Adjust PR #5389

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

options

Merge branch 'nicolevonvon-develop' into develop

2015-10-27 20:19:09 -05:00

shared

Merge branch 'develop' into sabrecat/more-modals

2015-10-28 14:54:55 -04:00

social

feat(sharing): Pretty Tweet button for level up

2015-10-21 15:23:31 -04:00

static

fix(social): Better share image

2015-10-21 16:25:03 -05: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

use only client vars on index.jade

2015-08-14 20:58:57 +02:00