summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorcyberta <cyberta@riseup.net>2019-05-31 07:13:36 -0700
committercyberta <cyberta@riseup.net>2019-05-31 07:13:36 -0700
commit2f33a76419907c3d613c811fcf07233a8379d345 (patch)
tree02c718dacc2befd49d2597cda02451593258bad7 /.gitignore
parent3d3b9f40dfc4d6eabb60330c2d3a4029518eb292 (diff)
parent156da4996e3b7ae38bbb732b467d5f661fade299 (diff)
Merge branch 'update_openvpn' into 'master'
Update openvpn See merge request leap/bitmask_android!87
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index a32ba86e..eec89b75 100644
--- a/.gitignore
+++ b/.gitignore
@@ -67,7 +67,7 @@ id.zip
/build-native.sh~
local.properties
-gradle.properties*
+#gradle.properties*
*~
*.iml
.idea