diff options
| author | Parménides GV <parmegv@sdf.org> | 2015-05-01 10:34:33 +0200 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2015-05-01 10:34:33 +0200 |
| commit | e2e90dab0fcad09b342630617dd9da8be3d23f8c (patch) | |
| tree | 18671f6716133ca2dc2a059b82ad86d45d555fa5 /app/jni/jniglue.h | |
| parent | 834fe99739264d498e3e8c87002b0e92cf8160a0 (diff) | |
| parent | 436de7afeea2cd234db8a4b70ace396101126e88 (diff) | |
Merge branch 'feature/Move-log-in-button-to-the-Dashboard-6911' into feature/Look-for-a-better-solution-to-the-VPN-slider-#6863
Diffstat (limited to 'app/jni/jniglue.h')
0 files changed, 0 insertions, 0 deletions