Nathan Guse 4b3264d9bb Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103 ...

Conflicts:
	phpBB/includes/functions_posting.php
	phpBB/language/en/email/forum_notify.txt
	phpBB/language/en/email/newtopic_notify.txt
	phpBB/language/en/email/topic_notify.txt

2012-10-16 23:33:57 -05:00

..

notifications

[ticket/11103] Fix comma usage

2012-10-14 12:45:04 -05:00

admin_activate.txt

- fixing some bugs

2007-01-20 17:58:27 +00:00

admin_send_email.txt

[ticket/10161] all "e-mail" strings in language files changed to "email"

2012-04-15 20:10:51 +02:00

admin_welcome_activated.txt

[ticket/10166] No longer refer to previous mail in admin_welcome_activated.txt

2011-10-29 00:32:38 +02:00

admin_welcome_inactive.txt

[ticket/10161] all "e-mail" strings in language files changed to "email"

2012-04-15 20:10:51 +02:00

coppa_resend_inactive.txt

[ticket/10161] all "e-mail" strings in language files changed to "email"

2012-04-15 20:10:51 +02:00

coppa_welcome_inactive.txt

[ticket/10161] all "e-mail" strings in language files changed to "email"

2012-04-15 20:10:51 +02:00

email_notify.txt

[ticket/10161] all "e-mail" strings in language files changed to "email"

2012-04-15 20:10:51 +02:00

forum_notify.txt

Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103

2012-10-16 23:33:57 -05:00

group_added.txt

- fixing some bugs

2007-01-20 17:58:27 +00:00

group_approved.txt

- fixing some bugs

2007-01-20 17:58:27 +00:00

group_request.txt

Changes to group display #32155, #32145, #32085, #26675, #26265

2008-08-14 12:36:06 +00:00

index.htm

ISO

2002-10-04 12:40:07 +00:00

installed.txt

[ticket/10161] all "e-mail" strings in language files changed to "email"

2012-04-15 20:10:51 +02:00

newtopic_notify.txt

Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103

2012-10-16 23:33:57 -05:00

pm_report_closed.txt

More language changes

2009-08-06 09:12:21 +00:00

pm_report_deleted.txt

it is not a post but a private message

2009-10-04 10:35:20 +00:00

post_approved.txt

- fixing some bugs

2007-01-20 17:58:27 +00:00

post_disapproved.txt

- fixing some bugs

2007-01-20 17:58:27 +00:00

privmsg_notify.txt

[ticket/8616] Rename U_INBOX to U_VIEW_MESSAGE

2011-10-13 19:28:46 +02:00

profile_send_email.txt

[ticket/10161] all "e-mail" strings in language files changed to "email"

2012-04-15 20:10:51 +02:00

profile_send_im.txt

- fixing some bugs

2007-01-20 17:58:27 +00:00

report_closed.txt

- fixing some bugs

2007-01-20 17:58:27 +00:00

report_deleted.txt

- fixing some bugs

2007-01-20 17:58:27 +00:00

topic_approved.txt

- fixing some bugs

2007-01-20 17:58:27 +00:00

topic_disapproved.txt

- fixing some bugs

2007-01-20 17:58:27 +00:00

topic_notify.txt

Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103

2012-10-16 23:33:57 -05:00

user_activate_inactive.txt

fixing some bugs, most being submitted grammatical/spelling errors.

2007-01-21 18:33:45 +00:00

user_activate_passwd.txt

- fixing some bugs

2007-01-20 17:58:27 +00:00

user_activate.txt

- fixing some bugs

2007-01-20 17:58:27 +00:00

user_reactivate_account.txt

[ticket/10161] all "e-mail" strings in language files changed to "email"

2012-04-15 20:10:51 +02:00

user_remind_inactive.txt

More language changes

2009-08-06 09:12:21 +00:00

user_resend_inactive.txt

[ticket/10161] all "e-mail" strings in language files changed to "email"

2012-04-15 20:10:51 +02:00

user_welcome_inactive.txt

[ticket/10161] all "e-mail" strings in language files changed to "email"

2012-04-15 20:10:51 +02:00

user_welcome.txt

[ticket/10161] all "e-mail" strings in language files changed to "email"

2012-04-15 20:10:51 +02:00