aboutsummaryrefslogtreecommitdiffstats
path: root/mod/settings.php
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-06-15 17:30:08 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-06-15 17:30:08 -0700
commit8c7472c6c337f0cf58d744433e3de70ab33b430b (patch)
tree293bb3b84407475c380b11c015f9086138ef3766 /mod/settings.php
parent859a2ac8ef1c3ce234b894598be846cbc89cf54a (diff)
parente0779e32b42e0fc00cd060f2baa25656d15b7885 (diff)
downloadvolse-hubzilla-8c7472c6c337f0cf58d744433e3de70ab33b430b.tar.gz
volse-hubzilla-8c7472c6c337f0cf58d744433e3de70ab33b430b.tar.bz2
volse-hubzilla-8c7472c6c337f0cf58d744433e3de70ab33b430b.zip
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts: view/nl/messages.po view/nl/strings.php
Diffstat (limited to 'mod/settings.php')
0 files changed, 0 insertions, 0 deletions