friendica f07df4f667 merge

2013-03-02 15:46:54 -08:00

..

smarty3

newline at end of header

2013-01-11 10:00:10 -07:00

cmnt_received_eml.tpl

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

follow_notify_eml.tpl

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

friend_complete_eml.tpl

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +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

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

lostpass_eml.tpl

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

mail_received_html_body_eml.tpl

get rid of 'Friendika'

2012-10-18 21:51:45 -07: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

ES: update to the strings

2012-11-01 13:12:54 +01:00

passchanged_eml.tpl

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

register_open_eml.tpl

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

register_verify_eml.tpl

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

request_notify_eml.tpl

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

strings.php

merge

2013-03-02 15:46:54 -08:00

wall_received_eml.tpl

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00