Daniel Lazar f25139dc2b solved merge conflicts 9 lat temu
..
api_keys.xml 09297a5968 use google maps debug api key 9 lat temu
arrays.xml f8129bf3e9 changed Tracing JSON to only JSON 9 lat temu
attrs.xml cc96bcc728 Back navigation fixed now. 10 lat temu
broadcast.xml 179924fbd4 preperations for release build and cleanup 10 lat temu
colors.xml 54a036e64c changed behaviour of up navigation to return to old fragment state 10 lat temu
connection_info.xml b1c201468a display internal/external attack for records 9 lat temu
dimens.xml a468c67df0 First steps... 10 lat temu
protocols.xml f137b5eaa5 added the new FileDiskDriver 9 lat temu
strings.xml 506deee6dc changed app info to about 9 lat temu
strings_disclaimer.xml 38138e5814 changed disclaimer text and added other screens to analytics tracking 10 lat temu
strings_gui.xml 179924fbd4 preperations for release build and cleanup 10 lat temu
strings_preferences.xml c352feeb76 more summaries for advanced settings 9 lat temu
styles.xml 54a036e64c changed behaviour of up navigation to return to old fragment state 10 lat temu
version.xml f80bf8764d fixed merge conflicts 9 lat temu