Tyler Renelle bf032ce808 Merge branch 'origin-paglias-fix-guilds' into develop ...

Conflicts:
	public/css/index.styl

2013-09-11 17:18:36 -04:00

..

options

add fix for joining guild

2013-09-11 16:32:56 +02:00

shared

add margin-right to all .btn, typo in stylus, add build to .nodemonignore

2013-09-11 20:36:57 +02:00

static

typo

2013-09-10 19:10:58 -04:00

tasks

[#1444] implement delete-tag (incl server route). run tags-cleanup migration

2013-09-09 00:04:02 -04:00

404.html

Adding empty derby project

2012-04-26 22:03:01 -04:00

error.html

send error page to user

2013-08-21 00:44:28 -04:00

index.jade

[#1396] setup tour, using user.flags.showTour now instead of

2013-09-10 18:06:16 -04:00