Kevan Ahlquist c57a75f78f Merge branch 'master' into stats ...

Conflicts:
	app/components/containers/containers.html
	app/components/images/images.html

2015-09-09 22:55:07 -05:00

..

components

Merge branch 'master' into stats

2015-09-09 22:55:07 -05:00

shared

Updated docs links in services.

2015-08-29 02:38:03 -05:00

app.js

Fixed dashboard graphs, Chart.js doesn't like charts being hidden on creation, fixed routing issue to dashboard, version bump.

2015-08-29 01:57:08 -05:00