Commit graph

6 commits

Author SHA1 Message Date
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
erik
b57b89516f Edited view/sv/settings.tpl via GitHub 2011-03-22 12:17:25 -07:00
Friendika
c4b292a4f1 account/profile/contacts export 2011-03-22 03:07:46 -07:00
Friendika
b7292bc673 user pref -> block remote wall posting 2011-03-20 17:54:50 -07:00
Friendika
a5d5ae5efa updated swedish templates 2011-03-17 15:26:45 -07:00
erik
e94ae8d396 commit001 2011-03-11 20:12:32 +01:00