Botnet_Research/hostage @ 81d3c381309b8bea823f47c6c13c99c7175db225

Alexander Brakowski 81d3c38130 solved merge conflicts int res/xml/profile_preferences.xml		пре 10 година
..
preferences.xml	b8fff452a9 added settings fragment, and added a create new button to the action button to the action bar	пре 10 година
profile_preferences.xml	81d3c38130 solved merge conflicts int res/xml/profile_preferences.xml	пре 10 година
settings_preferences.xml	43ae701267 further translation work, especially in settings and profile manager	пре 10 година