clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Files
cb3586a2807b98f77fa1cb075ff15d981e473c21
friendica/view/de
History
Michael Vogel cb3586a280 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	view/de/strings.php
2012-12-19 12:24:02 +01:00
..
cmnt_received_eml.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
cmnt_received_html_body_eml.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
cmnt_received_text_body_eml.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
follow_notify_eml.tpl
DE update to the strings
2012-04-30 08:39:12 +02:00
friend_complete_eml.tpl
DE update to strings and templates
2012-05-25 06:04:33 +02:00
htconfig.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
intro_complete_eml.tpl
DE: update to the strings and some mail templates
2012-05-22 12:17:01 +02:00
lostpass_eml.tpl
DE: new email templates translated
2012-05-05 09:11:25 +02:00
mail_received_html_body_eml.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
mail_received_text_body_eml.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
messages.po
DE: update to the strings
2012-12-17 11:11:32 +01:00
passchanged_eml.tpl
DE strings update
2012-04-22 13:13:27 +02:00
register_open_eml.tpl
DE update to strings and templates
2012-05-25 06:04:33 +02:00
register_verify_eml.tpl
DE strings update
2012-04-22 13:13:27 +02:00
request_notify_eml.tpl
DE strings update
2012-04-22 13:13:27 +02:00
strings.php
Merge remote-tracking branch 'upstream/master'
2012-12-19 12:24:02 +01:00
update_fail_eml.tpl
DE: new email templates translated
2012-05-05 09:11:25 +02:00
wall_received_eml.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
wall_received_html_body_eml.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
wall_received_text_body_eml.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00