This repository has been archived on 2024-08-19. You can view files and clone it, but cannot push or open issues or pull requests.

friendica ee75efd951 Merge branch 'master' of https://github.com/mrjive/red into mrjive-master ...

Conflicts:
	view/it/messages.po

2014-07-23 16:46:02 -07: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

IT: updated strings

2014-07-19 11:47:48 +02:00

friend_complete_eml.tpl

IT: updated strings

2014-07-19 11:47:48 +02:00

htconfig.tpl

reset email templates to English

2013-06-16 16:49:46 -07:00

intro_complete_eml.tpl

IT: updated strings

2014-07-19 11:47:48 +02:00

lostpass_eml.tpl

IT: updated strings

2014-07-19 11:47:48 +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

Merge branch 'master' of https://github.com/mrjive/red into mrjive-master

2014-07-23 16:46:02 -07:00

passchanged_eml.tpl

IT: updated strings

2014-07-19 11:47:48 +02:00

register_open_eml.tpl

IT: updated strings

2014-07-19 11:47:48 +02:00

register_verify_eml.tpl

IT: updated strings

2014-07-19 11:47:48 +02:00

register_verify_member.tpl

IT: updated strings

2014-07-19 11:47:48 +02:00

request_notify_eml.tpl

IT: updated strings

2014-07-19 11:47:48 +02:00

strings.php

IT: updated strings

2014-07-19 11:47:48 +02:00

update_fail_eml.tpl

IT: updated strings

2014-07-19 11:47:48 +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