| commit | 99604beb995809d57038e8a336939b841fda91f0 | [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 | 03b8071962c6900a8c11bf90dc79fabb3c2551ea | |
| parent | 9b71ee05e3caff29ee13148e0675cceb37c6bcba [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