aboutsummaryrefslogtreecommitdiffstats
path: root/view/de/contact_edit.tpl
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-02-05 13:01:28 -0800
committerFriendika <info@friendika.com>2011-02-05 13:01:28 -0800
commitc26463b65b4b98f9aca77781fd74a7fe99f73814 (patch)
tree341d42356870f767cb6711ddf274f9e7665af096 /view/de/contact_edit.tpl
parent8cced061bba8d5ef18e2fa5ead0edcdc90d06e73 (diff)
parentc4ddee005ebcf912c913e12a17e65ab8826650a6 (diff)
downloadvolse-hubzilla-c26463b65b4b98f9aca77781fd74a7fe99f73814.tar.gz
volse-hubzilla-c26463b65b4b98f9aca77781fd74a7fe99f73814.tar.bz2
volse-hubzilla-c26463b65b4b98f9aca77781fd74a7fe99f73814.zip
Merge branch 'omigeot-master'
Conflicts: view/fr/strings.php
Diffstat (limited to 'view/de/contact_edit.tpl')
0 files changed, 0 insertions, 0 deletions