diff options
| author | Heather Miller <heather.miller@epfl.ch> | 2016-12-18 16:07:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-18 16:07:30 -0500 |
| commit | d6f1f8a66c026bde74f0ca1addcbf731e97005d1 (patch) | |
| tree | b5ca30f31d51f102daf190a07a060b819bd69e6d /.gitignore | |
| parent | de49a518d27f60bf560044aa051d3067b211000c (diff) | |
| parent | 46dde2378a1d7c1b45134ef851a2558a40a52ec1 (diff) | |
Merge branch 'master' into zanin_dist-langszanin_dist-langs
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -1,3 +1,5 @@ _site .sass-cache .jekyll-metadata + +.DS_Store |