Commit graph

10 commits

Author SHA1 Message Date
Friendika 1bba63fb60 Merge branch 'erikl-master'
Conflicts:
	view/sv/settings.tpl
2011-04-04 15:46:33 -07:00
erik 2f48135b71 Edited view/sv/settings.tpl via GitHub 2011-03-29 11:42:04 -07:00
erik 47169d71fd Edited view/sv/settings.tpl via GitHub 2011-03-29 11:19:49 -07:00
Friendika 6a280c321d small wording change 2011-03-28 18:06:36 -07:00
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