diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-11-04 22:56:36 +0100 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-11-04 22:56:36 +0100 |
| commit | 7d4e03cc9a80c00eddc47fece8147fbaef52f536 (patch) | |
| tree | d24eea8186eea60eb943ab422b4f9fed2bfc8a79 /src/main/res/xml | |
| parent | 88c07936940353128dc7d446a9f14dbfbc3ce7c9 (diff) | |
| parent | 39183418ab133f14bddc389dea8419980538f629 (diff) | |
Merge branch 'development' of https://github.com/siacs/Conversations into development
Diffstat (limited to 'src/main/res/xml')
| -rw-r--r-- | src/main/res/xml/preferences.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index 06ab7560e..15a61e879 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -110,5 +110,8 @@ android:summary="@string/pref_never_send_crash_summary" android:title="@string/pref_never_send_crash" /> </PreferenceCategory> + <eu.siacs.conversations.ui.AboutPreference + android:summary="@string/pref_about_conversations_summary" + android:title="@string/title_activity_about" /> </PreferenceScreen> |