Tyler Renelle 184e145914 Merge remote-tracking branch 'refs/remotes/nmjones/develop' into develop ...

Conflicts:
	views/options/settings.jade

2014-08-23 16:05:17 -06:00

..

main

fix(tags): fix sortable tags by separating edit & !edit into diff

2014-08-19 15:21:39 -06:00

options

Merge remote-tracking branch 'refs/remotes/nmjones/develop' into develop

2014-08-23 16:05:17 -06:00

shared

feat(sortable): use angular-ui-sortable instead of jqueryui directly

2014-08-19 14:35:10 -06:00

static

remove beta from api call examples

2014-07-18 11:58:25 +02:00

index.jade

fix bug music not playing if music menu not open + integrate daily/todo/reward sounds

2014-08-09 17:29:56 +09:00