diff options
| author | Sean Leonard <meanderingcode@aetherislands.net> | 2013-07-04 09:17:20 -0600 |
|---|---|---|
| committer | Sean Leonard <meanderingcode@aetherislands.net> | 2013-07-04 09:17:20 -0600 |
| commit | 1f7d1334006e816c12f0d1915fcfdc697636dfec (patch) | |
| tree | 1657ab030b0c5afc9fbf5a37a8dea97adaf4a196 /res/layout/config_converter.xml | |
| parent | a34d46d4ccf6f5fb87ce11de6be79179d50b30ec (diff) | |
| parent | 2c6b2b47a48652d1e43a7f5383d6f91b7c5d06f1 (diff) | |
Merge branch 'hotfix-jb-certificate-bypass' into develop
Diffstat (limited to 'res/layout/config_converter.xml')
0 files changed, 0 insertions, 0 deletions