Friendika 067626380d 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

2011-03-24 04:36:53 -07:00

73 KiB

Raw Blame History

View Raw