aboutsummaryrefslogtreecommitdiffstats
path: root/view/es/strings.php
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-08-11 22:41:27 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-08-11 22:41:27 -0700
commitb634c08d0e4a79b650439429254288789f47ba50 (patch)
treee93a1ffde653c7b5aab68a1482f78fb39448780e /view/es/strings.php
parent2d9d4dfeb37f66d502e41ff47312aa4c257a3641 (diff)
downloadvolse-hubzilla-b634c08d0e4a79b650439429254288789f47ba50.tar.gz
volse-hubzilla-b634c08d0e4a79b650439429254288789f47ba50.tar.bz2
volse-hubzilla-b634c08d0e4a79b650439429254288789f47ba50.zip
resolve conflict
Diffstat (limited to 'view/es/strings.php')
0 files changed, 0 insertions, 0 deletions