Merge branch 'master' into prettysimple
authorJason Skomorowski <jason@indexdata.com>
Tue, 4 Nov 2014 17:15:00 +0000 (12:15 -0500)
committerJason Skomorowski <jason@indexdata.com>
Tue, 4 Nov 2014 17:15:00 +0000 (12:15 -0500)
Conflicts:
src/templates/facets.handlebars


No differences found