summaryrefslogtreecommitdiff
path: root/src/se/leap/openvpn/MainActivity.java
diff options
context:
space:
mode:
authorSean Leonard <meanderingcode@aetherislands.net>2014-02-28 17:21:36 -0800
committerSean Leonard <meanderingcode@aetherislands.net>2014-02-28 17:21:36 -0800
commitdfc259473a26bb71bca226c8290d227fa954bcb8 (patch)
tree1132b8e00b08bfdd690693bcd9ef25db482bc5d0 /src/se/leap/openvpn/MainActivity.java
parente6149d1d9ef77409e84d5982a92dd727f0bae2f7 (diff)
parent1fe78d00244f52f903435c970c0ebf0071a08f36 (diff)
Merge branch 'feature/remove-shared-preferences-methods-from-ConfigHelper' into develop
Conflicts: src/se/leap/bitmaskclient/Dashboard.java
Diffstat (limited to 'src/se/leap/openvpn/MainActivity.java')
0 files changed, 0 insertions, 0 deletions