aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-08-28 10:48:25 +0200
committeriNPUTmice <daniel@gultsch.de>2014-08-28 10:48:25 +0200
commitd8eeab087913d2ec26f8bc164794098b4c64bd35 (patch)
tree6a90469bbc1379c06c1a4d403d804ec1ec568824 /src
parent431d4ed44ba4e8e01ffe7bef69289a5651366537 (diff)
parent9c8b6b16d5fb5a738ac9642645063ec434c789bb (diff)
Merge branch 'development' of https://github.com/beriain/Conversations into development
Conflicts: res/values-eu/strings.xml
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions