Skip to content
Snippets Groups Projects
Commit 2f33a764 authored by cyberta's avatar cyberta
Browse files

Merge branch 'update_openvpn' into 'master' 

Update openvpn

See merge request !87
parents 3d3b9f40 156da499
No related branches found
No related tags found
1 merge request!87Update openvpn
Show whitespace changes
Inline Side-by-side
.gitignore
+ 1
− 1
View file @ 2f33a764
...@@ -67,7 +67,7 @@ id.zip ...@@ -67,7 +67,7 @@ id.zip
/build-native.sh~ /build-native.sh~
local.properties local.properties
gradle.properties* #gradle.properties*
*~ *~
*.iml *.iml
.idea .idea
......
gradle.properties 0 → 100644
+ 1
− 0
View file @ 2f33a764
org.gradle.jvmargs=-Xmx4096m
ics-openvpn @ 24e914e6
Subproject commit 5ebce4dcec19b1b114e19d8a3c6c9ed75907b18a Subproject commit 24e914e68ba6c456ee3f8b352d41236c94759777
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment