Tyler Renelle 962b854f87 Merge remote-tracking branch 'origin/sabe_tweak' into develop ...

Conflicts:
	views/options/social/tavern.jade

2013-11-27 11:28:31 -07:00

..

challenge-box.jade

reverting more bindonce changes...

2013-11-22 22:44:02 -08:00

challenges.jade

reverting more bindonce changes...

2013-11-22 22:44:02 -08:00

chat-box.jade

use jade class syntax

2013-11-24 17:49:25 +01:00

chat-message.jade

well, this wasn't the fix i was thinking of for #1893, but it works and I don't know why I didn't do it in the first place

2013-11-26 12:06:48 -08:00

create-group.jade

Challenges are no longer an upcoming feature!

2013-11-09 13:34:14 -06:00

group.jade

Consistent formatting of markdown hint in group edit fields

2013-11-24 07:41:41 -06:00

index.jade

avoid reloading for group operations

2013-11-01 21:08:36 +01:00

tavern.jade

Merge remote-tracking branch 'origin/sabe_tweak' into develop

2013-11-27 11:28:31 -07:00