| commit | 276c1b974f895a3ca31cadd86d48f43701b842fb | [log] [tgz] |
|---|---|---|
| author | Pingping Lin <pingping@onlab.us> | Wed Apr 20 18:02:10 2016 -0700 |
| committer | Pingping Lin <pingping@onlab.us> | Wed Apr 20 18:02:10 2016 -0700 |
| tree | 3a4d981ddfa75c6fb434f887d337782801e4a7e4 | |
| parent | 9f5fdcda6fd2ead414699ff76f2e2a5392f82c9f [diff] [blame] |
mcord merged into master-branch
diff --git a/.gitignore b/.gitignore index 7813bf4..9095902 100644 --- a/.gitignore +++ b/.gitignore
@@ -4,6 +4,7 @@ profile *.moved-aside .idea +setup/* xos/configurations/frontend/Dockerfile xos/core/xoslib/karma-* xos/core/xoslib/docs