aboutsummaryrefslogtreecommitdiffstats
path: root/.gitmodules
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-07-24 09:55:45 +0200
committeriNPUTmice <daniel@gultsch.de>2014-07-24 09:55:45 +0200
commit76de9dba7906fd5b23cbd5f2b884a7f21c0fe194 (patch)
tree81cbe857814f8350adfe0310d1c2d71899bf075d /.gitmodules
parent8d5f2a9195dc7b4dd9d2e15be75b3c68d8bc95a5 (diff)
parent4d0d35f6bc0efcdc2423030490da9125f36404eb (diff)
Merge branch 'development' of https://github.com/rostovtsev/Conversations into rostovtsev-development
Conflicts: res/values-ru/strings.xml
Diffstat (limited to '.gitmodules')
0 files changed, 0 insertions, 0 deletions