Sabe Jones 56fbc33d1c Merge branch 'develop' into Move-Overview-To-Website ...

Conflicts:
	website/src/routes/pages.js

2015-11-05 14:31:00 -05:00

..

main

Adjust PR #5389

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

options

Merge branch 'develop' into srrvnn-develop

2015-11-03 07:31:48 -06:00

shared

Merge branch 'develop' into Move-Overview-To-Website

2015-11-05 14:31:00 -05:00

static

Merge branch 'develop' into Move-Overview-To-Website

2015-11-05 14:31:00 -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