diff options
| author |  Vitaly Takmazov | 2016-01-14 13:16:40 +0300 |
|---|---|---|
| committer | Vitaly Takmazov | 2016-01-14 13:16:40 +0300 |
| commit | 5c207f65b0cafbaa0cbdae72a5a485cf7aa62556 (patch) | |
| tree | 60c303f317236c2caab896173fafdaff1eebb115 /.gitignore | |
| parent | 38013dd67292fa186e3a07d098bc9a484ea2bd0f (diff) | |
| parent | ee86970fcae9878af0adcad00cf5333647b8babf (diff) | |
Merge branch 'develop' of ssh://den.jabber.ru:2205/var/lib/git/com.juick.api into develop
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -2,11 +2,11 @@ build/* .gradle/*
deps/*
.idea/*
-*.iml
+**/*.iml
**/juick.conf
/build/
/bin/
/.nb-gradle/
.settings/*
.classpath
-.project
\ No newline at end of file +.project
|