aboutsummaryrefslogtreecommitdiffstats
path: root/view/prv_message.tpl
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-03-17 14:44:06 -0700
committerFriendika <info@friendika.com>2011-03-17 14:44:06 -0700
commit6b37e6d48d8d7a313d2eb88155752241c6c930d5 (patch)
tree46af2ae9350d3f1d27fffbdac0aa5e753c206b93 /view/prv_message.tpl
parent90178f86cb02cc3b6d2b7e5d49222dfeec0e8921 (diff)
parente94ae8d396b8583407b140faf211f4f92a503bc6 (diff)
downloadvolse-hubzilla-6b37e6d48d8d7a313d2eb88155752241c6c930d5.tar.gz
volse-hubzilla-6b37e6d48d8d7a313d2eb88155752241c6c930d5.tar.bz2
volse-hubzilla-6b37e6d48d8d7a313d2eb88155752241c6c930d5.zip
Merge branch 'master' of http://github.com/erikl/friendika into erikl-master
Conflicts: view/sv/contact_edit.tpl view/sv/strings.php
Diffstat (limited to 'view/prv_message.tpl')
0 files changed, 0 insertions, 0 deletions