diff options
| author | lookshe <github@lookshe.org> | 2016-04-17 17:37:43 +0200 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2016-04-17 17:37:43 +0200 |
| commit | ad6208e53095e3a9870cdc0eae9b7c068a42829a (patch) | |
| tree | d5216f567722d4d6a959ab262c6cbef22f1931e7 /src/main/res/values/attrs.xml | |
| parent | 1f81683d26eba69d7e4373bbda6295d5d7843777 (diff) | |
| parent | de7631e300eb9e578336d642dd279faecdb09391 (diff) | |
Merge branch 'trz/rebase' into trz/rename
Conflicts:
build.gradle
src/main/java/de/thedevstack/conversationsplus/services/AvatarService.java
src/main/res/values-bg/strings.xml
src/main/res/values-cs/strings.xml
src/main/res/values-fr/strings.xml
src/main/res/values-ja/strings.xml
src/main/res/values-nl/strings.xml
src/main/res/values-pt/strings.xml
src/main/res/values-ro-rRO/strings.xml
src/main/res/values-sv/strings.xml
src/main/res/values-zh-rCN/strings.xml
src/main/res/values/strings.xml
Diffstat (limited to 'src/main/res/values/attrs.xml')
| -rw-r--r-- | src/main/res/values/attrs.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml index 2cad436c..135301c0 100644 --- a/src/main/res/values/attrs.xml +++ b/src/main/res/values/attrs.xml @@ -27,6 +27,7 @@ <attr name="icon_search" format="reference"/> <attr name="icon_secure" format="reference"/> <attr name="icon_settings" format="reference"/> + <attr name="icon_share" format="reference"/> <attr name="icon_import_export" format="reference"/> <declare-styleable name="AmbilWarnaPreference"> <attr name="supportsAlpha" |