summaryrefslogtreecommitdiff
path: root/public/pic/smiles
diff options
context:
space:
mode:
authormsquare <msquare@notrademark.de>2016-11-15 15:35:55 +0100
committermsquare <msquare@notrademark.de>2016-11-15 15:35:55 +0100
commit3873b8dc6113aa465159ff62ffd59dc22479fa3c (patch)
tree0a6f7228d400f950a345df2f91f44d65fa7eaafb /public/pic/smiles
parent16ed2ae68381362cbfe66d10226b9dedbfaacba5 (diff)
parent852f17a535815cf0d01b13f1ef577b1387cfc5f9 (diff)
Merge branch 'pr/276'
# Conflicts: # locale/de_DE.UTF-8/LC_MESSAGES/default.mo # locale/de_DE.UTF-8/LC_MESSAGES/default.po
Diffstat (limited to 'public/pic/smiles')
0 files changed, 0 insertions, 0 deletions