aboutsummaryrefslogtreecommitdiffstats
path: root/view/fr
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-07-27 18:01:20 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-07-27 18:01:20 -0700
commit3269d4632f180887d5eca96fcfaa03370bbae2a3 (patch)
tree8f67725e77b4565a2cbac7e67de7ff952db01ee9 /view/fr
parent70a5a7b717955138279f2dd8f2a1de16aa76bd53 (diff)
parent0b232a610cdcbb701dacf8dd661b86b64bb582fc (diff)
downloadvolse-hubzilla-3269d4632f180887d5eca96fcfaa03370bbae2a3.tar.gz
volse-hubzilla-3269d4632f180887d5eca96fcfaa03370bbae2a3.tar.bz2
volse-hubzilla-3269d4632f180887d5eca96fcfaa03370bbae2a3.zip
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts: util/messages.po
Diffstat (limited to 'view/fr')
0 files changed, 0 insertions, 0 deletions