diff options
author | steckbrief <steckbrief@chefmail.de> | 2016-04-20 21:32:03 +0200 |
---|---|---|
committer | steckbrief <steckbrief@chefmail.de> | 2016-04-20 21:32:03 +0200 |
commit | 70938a31a0e78203449d769fa5bda15ce73d1ed4 (patch) | |
tree | d789c0c44b26bdeeedde286ab3e09a67c3dd0e5b /.gitignore | |
parent | 58572ba858835437011d2f450bd90fb93455b5c9 (diff) | |
parent | 7df96caedbbb96a28d4f7e07fa2d159c8ca1373f (diff) |
Merge branch 'master' into message_display_rework
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -7,6 +7,8 @@ src/playstore/res/values/gcm.xml # https://github.com/github/gitignore/blob/master/Gradle.gitignore .gradle/ build/ +captures/ +gradle.properties # Ignore Gradle GUI config gradle-app.setting |