| commit | c145c9da3323505bc151ad3d6103a2c224e0ff8a | [log] [tgz] |
|---|---|---|
| author | Max Klyus <xmaruto@gmail.com> | Mon May 16 02:11:04 2016 -0700 |
| committer | Max Klyus <xmaruto@gmail.com> | Mon May 16 02:11:04 2016 -0700 |
| tree | 995f3d1d33a449e43feebb34ec87278b257f9037 | |
| parent | 7630e6e8be78f131dd9fe5e643d12b31864656cf [diff] [blame] |
another merge with master branch
diff --git a/.gitignore b/.gitignore index a0d550c..3c86d00 100644 --- a/.gitignore +++ b/.gitignore
@@ -7,6 +7,9 @@ setup/* setup/id_rsa/* xos/configurations/frontend/Dockerfile +xos/configurations/mcord/admin-openrc.sh +xos/configurations/setup/* +xos/configurations/common/* xos/core/xoslib/karma-* xos/core/xoslib/docs xos/core/xoslib/coverage