app/src/main/res/values · 3ef61a502e2fde2529495f4e828b7217b6f29b7e · Administrator / xabber-android

Merge branch 'XEP-0280' of https://github.com/Semenchikus/xabber-android into Semenchikus-XEP-0280 · cd53ba41

Grigory Fedorov authored May 12, 2015

Conflicts:
	res/values-ru/preference_editor.xml
	res/values/preference_editor.xml
	res/values/preferences.xml
	res/xml/preference_editor.xml
	src/com/xabber/android/data/SettingsManager.java
	src/com/xabber/android/data/message/AbstractChat.java
	src/com/xabber/android/data/message/MessageManager.java

cd53ba41

Name	Last commit	Last update
..
about_viewer.xml		Loading commit data...
account_editor.xml		Loading commit data...
account_list.xml		Loading commit data...
avatars.xml		Loading commit data...
change_log.xml		Loading commit data...
chat_viewer.xml		Loading commit data...
color_arrays.xml		Loading commit data...
colors.xml		Loading commit data...
connections.xml		Loading commit data...
contact_editor.xml		Loading commit data...
contact_list.xml		Loading commit data...
contact_viewer.xml		Loading commit data...
dimens.xml		Loading commit data...
fingerprint_viewer.xml		Loading commit data...
market.xml		Loading commit data...
muc_editor.xml		Loading commit data...
notification_bar.xml		Loading commit data...
notification_bar_arrays.xml		Loading commit data...
offline_contacts.xml		Loading commit data...
phrase_editor.xml		Loading commit data...
preference_editor.xml		Loading commit data...
preferences.xml		Loading commit data...
secret_viewer.xml		Loading commit data...
status_editor.xml		Loading commit data...
styles.xml		Loading commit data...
theme.xml		Loading commit data...
versions.xml		Loading commit data...
words.xml		Loading commit data...

Download source code

Download this directory