Tyler Renelle 4c3f04cc49 Merge branch 'mounts' into develop ...

Conflicts:
	views/options/inventory/stable.jade

2013-11-14 13:04:44 -08:00

..

main

allow editing tag & task.tag even if in challenge

2013-11-05 09:49:01 -08:00

options

Merge branch 'mounts' into develop

2013-11-14 13:04:44 -08:00

shared

Merge branch 'mounts' into develop

2013-11-14 13:04:44 -08:00

static

move js & css files to public/manifest.json, allow for stylus files editing without restarting server on development, removed hashres from dev build

2013-11-04 22:13:03 +01:00

index.jade

move js & css files to public/manifest.json, allow for stylus files editing without restarting server on development, removed hashres from dev build

2013-11-04 22:13:03 +01:00