diff options
| author | Heather Miller <heather.miller@epfl.ch> | 2016-12-18 15:59:07 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-18 15:59:07 -0500 |
| commit | b8ea0136877b83801707f85ca902ce033fffe360 (patch) | |
| tree | 0405d53412ce19830d1550f08d4879148d79201f /.gitignore | |
| parent | 313f5c7bdd02346683b376f54301792e9f2e48f5 (diff) | |
| parent | 5b299d189255e04ca3481a15e15b2a2e10b29b42 (diff) | |
Merge branch 'master' into Jingjing-Abhilash-bigdata-v2Jingjing-Abhilash-bigdata-v2
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 |