aboutsummaryrefslogtreecommitdiffstats
path: root/.gitattributes
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-05-11 17:15:07 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-05-11 17:15:07 -0700
commitaceb7ae8e96ec5453f182c39a98acec64a6b3d6d (patch)
treefca34b8114328b6d6101b34452208bbc5780bf61 /.gitattributes
parent1dc5b6a03a5d0b07ea85dc51d4fd58d3fcf99a4a (diff)
parentf4fc6b778216f10ba2bcc75f8a08afea1210e81c (diff)
downloadvolse-hubzilla-aceb7ae8e96ec5453f182c39a98acec64a6b3d6d.tar.gz
volse-hubzilla-aceb7ae8e96ec5453f182c39a98acec64a6b3d6d.tar.bz2
volse-hubzilla-aceb7ae8e96ec5453f182c39a98acec64a6b3d6d.zip
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts: view/pt-br/messages.po view/pt-br/strings.php
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions