]> git.mxchange.org Git - friendica.git/commit
Merge branch 'erikl-master'
authorFriendika <info@friendika.com>
Thu, 24 Mar 2011 11:36:53 +0000 (04:36 -0700)
committerFriendika <info@friendika.com>
Thu, 24 Mar 2011 11:36:53 +0000 (04:36 -0700)
commit067626380db6d5ed71d68bd91481ff51cfa76915
tree15b24c4718891a5a8fbaa0ce9964b0714524c6ed
parent51447932f707e1d0177ee4700266285ed80be2f6
parentba99ce3d0ab77bd62971cd3962d964be1ddee205
Merge branch 'erikl-master'

Conflicts:
view/sv/insecure_net.tpl
view/sv/jot-header.tpl
view/sv/msg-header.tpl
view/sv/profile_edit.tpl
view/sv/profile_tabs.tpl
view/sv/strings.php
view/sv/profile_edit.tpl
view/sv/settings.tpl
view/sv/strings.php