Merge branch 'next-release'

This commit is contained in:
Jeff Parsons 2016-07-25 14:08:53 -07:00
commit 90acf553c1

3
.gitignore vendored
View file

@ -14,11 +14,9 @@
.settings
.sass-cache
_site
Gemfile.lock
node_modules
/videos
/web
archive/
c64/
ecp/
projects/
@ -27,3 +25,4 @@ restricted/
src/
tmp/
unlisted/
archive/