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

..

images.html

Allow filtering images

2015-09-03 13:38:23 +02:00

imagesController.js

Whitespace diff, ran everything through the formatter.

2015-08-25 00:59:54 -05:00