diff options
| author | Christian S <christian@pix-art.de> | 2016-02-14 17:00:16 +0100 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-02-14 17:00:16 +0100 |
| commit | 5e64737d532e493c00ab579ce8bd4695c4a5a5a2 (patch) | |
| tree | b82e1131467da94f4f3f58c51bf99dc26add4fc0 /src/main/res/values/arrays.xml | |
| parent | 1a6062cc17c421a66d7dbac0389dc7b3a19e3a5f (diff) | |
| parent | 300326fba3a63fce546d952ac455758ed2cbeca0 (diff) | |
Merge branch 'siacs/master' into development
Diffstat (limited to 'src/main/res/values/arrays.xml')
| -rw-r--r-- | src/main/res/values/arrays.xml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml index 0f2dbb1a4..cc04d98ba 100644 --- a/src/main/res/values/arrays.xml +++ b/src/main/res/values/arrays.xml @@ -69,4 +69,10 @@ <item>@string/automatically</item> <item>@string/always</item> </string-array> + + <string-array name="mam_prefs"> + <item>@string/never</item> + <item>@string/contacts</item> + <item>@string/always</item> + </string-array> </resources> |