aboutsummaryrefslogtreecommitdiffstats
path: root/view/es-es/hstrings.php
diff options
context:
space:
mode:
authorManuel Jiménez Friaza <mjfriaza@openmailbox.org>2018-11-24 13:01:01 +0100
committerManuel Jiménez Friaza <mjfriaza@openmailbox.org>2018-11-24 13:01:01 +0100
commitf865d6e5dab19122fffc677da495b21d3d5e93e7 (patch)
tree8631750db2c385438207326479350ea909a625b4 /view/es-es/hstrings.php
parent0bba9482dfbcc0fd8bea880ac3820548281ecfc2 (diff)
parentbc9f2922e0e255e97cb607d099f60c8a81c4736f (diff)
downloadvolse-hubzilla-f865d6e5dab19122fffc677da495b21d3d5e93e7.tar.gz
volse-hubzilla-f865d6e5dab19122fffc677da495b21d3d5e93e7.tar.bz2
volse-hubzilla-f865d6e5dab19122fffc677da495b21d3d5e93e7.zip
Resolved merge conflicts
Diffstat (limited to 'view/es-es/hstrings.php')
0 files changed, 0 insertions, 0 deletions