diff options
| author | Parménides GV <parmegv@sdf.org> | 2015-03-19 15:09:08 +0100 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2015-03-19 15:09:08 +0100 |
| commit | 5ccaa263e3bafd212b8f4f037a87bf0770ee65e3 (patch) | |
| tree | 4c5a23dcb1a7bc22ec06faf399756bd4bcb7e817 /app/src/main/assets | |
| parent | f476425c42a08e92ecb0cea99908e9b8d635fa69 (diff) | |
| parent | bb2a944265da15eeba35106f2e2bcda288855527 (diff) | |
Merge branch 'feature/Warn-users-about-browser-and-vpn-inconsistency-#6783' into develop
Diffstat (limited to 'app/src/main/assets')
0 files changed, 0 insertions, 0 deletions