diff options
| author | steckbrief <steckbrief@chefmail.de> | 2016-04-18 19:58:40 +0200 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2016-04-18 19:58:40 +0200 |
| commit | ee0264d98c9a348ea29d12796bed25f9ba1494fb (patch) | |
| tree | cc559348547e504d37a6efa7826ea0120070babe /src/main/res/values-w585dp/dimens.xml | |
| parent | d94eb9309b4ab3ee1dfd3cee637b47a52223e15b (diff) | |
| parent | 7df96caedbbb96a28d4f7e07fa2d159c8ca1373f (diff) | |
Merge branch 'master' into introduce_cplus_database_version
Conflicts:
gradle/wrapper/gradle-wrapper.properties
src/main/res/values/strings.xml
Diffstat (limited to 'src/main/res/values-w585dp/dimens.xml')
0 files changed, 0 insertions, 0 deletions