Tyler Renelle f8f8a1334b Merge branch 'develop' into classes ...

Conflicts:
	views/options/inventory/stable.jade

2013-12-07 20:23:26 -07:00

..

main

use jade class syntax

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

options

Merge branch 'develop' into classes

2013-12-07 20:23:26 -07:00

shared

Merge branch 'develop' into classes

2013-12-07 20:23:26 -07: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

Merge branch 'develop' into classes

2013-12-02 18:24:33 -07:00