diff options
| author | iNPUTmice <daniel@gultsch.de> | 2015-01-29 23:26:41 +0100 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2015-01-29 23:26:41 +0100 |
| commit | 6c3ea7f2bdde738c48067ecb6b6588b7ad39a05e (patch) | |
| tree | 741f7defe8265ee8b61f95ddc3f3ecab9a72d158 /src/main/res/values/strings.xml | |
| parent | f2bf64d19d7eb14f34324311ebf4f95378d81fbe (diff) | |
| parent | 26bc2d387f9efb4fa936b95b2c6cc26b8503757f (diff) | |
Merge branch 'development' of https://github.com/siacs/Conversations into development
Diffstat (limited to 'src/main/res/values/strings.xml')
| -rw-r--r-- | src/main/res/values/strings.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 3d3d69a3..ae8dcd67 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -296,6 +296,7 @@ \n\nhttps://github.com/jitsi/otr4j\n(LGPL-3.0) \n\nhttps://developer.android.com/tools/support-library\n(Apache License, Version 2.0) \n\nhttps://github.com/zxing/zxing\n(Apache License, Version 2.0) + \n\nhttps://github.com/google/material-design-icons\n(CC BY 4.0) </string> <string name="title_pref_quiet_hours">Quiet Hours</string> <string name="title_pref_quiet_hours_start_time">Start time</string> |