aboutsummaryrefslogtreecommitdiffstats
path: root/view/eo/friend_complete_eml.tpl
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-01-15 16:14:43 -0800
committerfriendica <info@friendica.com>2014-01-15 16:14:43 -0800
commitec6b8e5cdaed1304c8740cbbd01153f4d9012568 (patch)
tree38ea9789ea8f4b4077f3761037c262b171bfc262 /view/eo/friend_complete_eml.tpl
parentf27d59a094cf755bd78123c703161f32d4b163db (diff)
parent4fdd9c39c58b82d47afe1e9b838e174d283ff068 (diff)
downloadvolse-hubzilla-ec6b8e5cdaed1304c8740cbbd01153f4d9012568.tar.gz
volse-hubzilla-ec6b8e5cdaed1304c8740cbbd01153f4d9012568.tar.bz2
volse-hubzilla-ec6b8e5cdaed1304c8740cbbd01153f4d9012568.zip
Merge branch 'master' of https://github.com/pixelroot/red into pixelroot-master
Conflicts: view/ru/strings.php
Diffstat (limited to 'view/eo/friend_complete_eml.tpl')
0 files changed, 0 insertions, 0 deletions