Joas Schilling 46994e8dfb Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/11814] Remove redundant text from the topic reply email notification.

2013-11-19 15:28:37 +01:00

..

short

[ticket/11471] Unrelated text in e-mail templates

2013-04-24 20:07:05 +02:00

admin_activate.txt

…

admin_send_email.txt

…

admin_welcome_activated.txt

…

admin_welcome_inactive.txt

…

bookmark.txt

[ticket/11103] Move all email templates to the email/ directory & prep short

2012-11-11 11:37:14 -06:00

coppa_resend_inactive.txt

…

coppa_welcome_inactive.txt

…

email_notify.txt

…

forum_notify.txt

Merge branch 'prep-release-3.0.12' into develop-olympus

2013-09-02 12:30:10 +02:00

group_added.txt

…

group_request.txt

…

index.htm

…

installed.txt

Merge branch 'develop-olympus' into develop

2013-07-30 01:47:02 +02:00

newtopic_notify.txt

Merge branch 'develop-olympus' into develop

2013-09-02 12:31:27 +02:00

pm_report_closed.txt

…

pm_report_deleted.txt

…

post_approved.txt

[ticket/11471] Unrelated text in e-mail templates

2013-04-24 20:07:05 +02:00

post_disapproved.txt

[ticket/11471] Unrelated text in e-mail templates

2013-04-24 20:07:05 +02:00

post_in_queue.txt

[ticket/11471] Unrelated text in e-mail templates

2013-04-24 20:07:05 +02:00

privmsg_notify.txt

[ticket/11103] Newlines at end of files

2012-12-08 13:20:14 -06:00

profile_send_email.txt

…

profile_send_im.txt

…

quote.txt

[ticket/11103] Move all email templates to the email/ directory & prep short

2012-11-11 11:37:14 -06:00

report_closed.txt

[ticket/11471] Unrelated text in e-mail templates

2013-04-24 20:07:05 +02:00

report_deleted.txt

[ticket/11471] Unrelated text in e-mail templates

2013-04-24 20:07:05 +02:00

report_pm.txt

[ticket/11471] Unrelated text in e-mail templates

2013-04-24 20:07:05 +02:00

report_post.txt

[ticket/11471] Unrelated text in e-mail templates

2013-04-24 20:07:05 +02:00

topic_approved.txt

[ticket/11471] Unrelated text in e-mail templates

2013-04-24 20:07:05 +02:00

topic_disapproved.txt

[ticket/11471] Unrelated text in e-mail templates

2013-04-24 20:07:05 +02:00

topic_in_queue.txt

[ticket/11471] Unrelated text in e-mail templates

2013-04-24 20:07:05 +02:00

topic_notify.txt

Merge branch 'develop-olympus' into develop

2013-11-19 15:28:37 +01:00

user_activate_inactive.txt

…

user_activate_passwd.txt

…

user_activate.txt

…

user_reactivate_account.txt

[ticket/11471] Unrelated text in e-mail templates

2013-04-24 20:07:05 +02:00

user_remind_inactive.txt

…

user_resend_inactive.txt

[ticket/11471] Unrelated text in e-mail templates

2013-04-24 20:07:05 +02:00

user_welcome_inactive.txt

…

user_welcome.txt

…