1
0
Fork 0
friendica_2020-09-1_sharedH.../view/sv
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
..
cmnt_received_eml.tpl Edited view/sv/cmnt_received_eml.tpl via GitHub 2011-03-22 10:38:31 -07:00
contact_edit.tpl Edited view/sv/contact_edit.tpl via GitHub 2011-03-22 10:41:01 -07:00
cropbody.tpl Edited view/sv/cropbody.tpl via GitHub 2011-03-22 10:42:02 -07:00
dfrn_req_confirm.tpl Edited view/sv/dfrn_req_confirm.tpl via GitHub 2011-03-22 10:43:45 -07:00
directory_header.tpl Edited view/sv/directory_header.tpl via GitHub 2011-03-22 10:45:16 -07:00
follow_notify_eml.tpl Edited view/sv/follow_notify_eml.tpl via GitHub 2011-03-22 10:46:49 -07:00
friend_complete_eml.tpl Edited view/sv/friend_complete_eml.tpl via GitHub 2011-03-22 10:48:52 -07:00
group_edit.tpl Edited view/sv/group_edit.tpl via GitHub 2011-03-22 10:50:36 -07:00
group_new.tpl Edited view/sv/group_new.tpl via GitHub 2011-03-22 10:51:30 -07:00
head.tpl Edited view/sv/head.tpl via GitHub 2011-03-22 10:52:45 -07:00
htconfig.tpl commit001 2011-03-11 20:12:32 +01:00
install_db.tpl Edited view/sv/install_db.tpl via GitHub 2011-03-22 10:55:11 -07:00
intro_complete_eml.tpl Edited view/sv/intro_complete_eml.tpl via GitHub 2011-03-22 10:56:22 -07:00
intros-top.tpl Edited view/sv/intros-top.tpl via GitHub 2011-03-22 10:57:00 -07:00
lostpass.tpl Edited view/sv/lostpass.tpl via GitHub 2011-03-22 10:58:50 -07:00
lostpass_eml.tpl Edited view/sv/lostpass_eml.tpl via GitHub 2011-03-22 10:59:40 -07:00
mail_received_html_body_eml.tpl Edited view/sv/mail_received_html_body_eml.tpl via GitHub 2011-03-22 11:01:09 -07:00
mail_received_text_body_eml.tpl Edited view/sv/mail_received_text_body_eml.tpl via GitHub 2011-03-22 11:02:24 -07:00
pagetypes.tpl Edited view/sv/pagetypes.tpl via GitHub 2011-03-22 11:04:26 -07:00
passchanged_eml.tpl Edited view/sv/passchanged_eml.tpl via GitHub 2011-03-22 11:05:36 -07:00
profile-hide-friends.tpl Edited view/sv/profile-hide-friends.tpl via GitHub 2011-03-22 12:01:47 -07:00
profile-in-directory.tpl Edited view/sv/profile-in-directory.tpl via GitHub 2011-03-22 12:03:00 -07:00
profile-in-netdir.tpl Edited view/sv/profile-in-netdir.tpl via GitHub 2011-03-22 12:04:06 -07:00
profile.php Edited view/sv/profile.php via GitHub 2011-03-22 11:07:18 -07:00
profile_advanced.php Edited view/sv/profile_advanced.php via GitHub 2011-03-22 11:53:34 -07:00
profile_edit.tpl Merge branch 'erikl-master' 2011-03-24 04:36:53 -07:00
profile_entry_default.tpl Edited view/sv/profile_entry_default.tpl via GitHub 2011-03-22 11:58:04 -07:00
profile_listing_header.tpl Edited view/sv/profile_listing_header.tpl via GitHub 2011-03-22 11:59:03 -07:00
profile_photo.tpl Edited view/sv/profile_photo.tpl via GitHub 2011-03-22 11:59:50 -07:00
pwdreset.tpl Edited view/sv/pwdreset.tpl via GitHub 2011-03-22 12:07:38 -07:00
register_open_eml.tpl Edited view/sv/register_open_eml.tpl via GitHub 2011-03-22 12:08:25 -07:00
register_verify_eml.tpl Edited view/sv/register_verify_eml.tpl via GitHub 2011-03-22 12:11:15 -07:00
registrations-top.tpl Edited view/sv/registrations-top.tpl via GitHub 2011-03-22 12:12:23 -07:00
registrations.tpl Edited view/sv/registrations.tpl via GitHub 2011-03-22 12:13:15 -07:00
request_notify_eml.tpl Edited view/sv/request_notify_eml.tpl via GitHub 2011-03-22 12:14:59 -07:00
settings.tpl Merge branch 'erikl-master' 2011-03-24 04:36:53 -07:00
settings_nick_set.tpl Edited view/sv/settings_nick_set.tpl via GitHub 2011-03-22 12:18:09 -07:00
settings_nick_subdir.tpl Edited view/sv/settings_nick_subdir.tpl via GitHub 2011-03-22 12:19:04 -07:00
settings_nick_unset.tpl Edited view/sv/settings_nick_unset.tpl via GitHub 2011-03-22 12:21:15 -07:00
strings.php Merge branch 'erikl-master' 2011-03-24 04:36:53 -07:00
wall_received_eml.tpl Edited view/sv/wall_received_eml.tpl via GitHub 2011-03-22 12:22:25 -07:00