Merge remote-tracking branch 'remotes/gallery/master'

This commit is contained in:
2015-12-20 14:01:46 +00:00
5 changed files with 409 additions and 2 deletions

7
.gitignore vendored
View File

@@ -1,9 +1,12 @@
/_build/target
/_layouts/private-*
/_site
/asset
/private
/.jekyll-metadata
/_python
/Gemfile.lock
/.sass-cache
/vendor
/composer.lock
/composer.phar
/asset
/gallery