Marc Alexander c96c6877bf Merge branch '3.1.x' ...

Conflicts:
	phpBB/includes/ucp/ucp_activate.php

2015-08-22 10:41:46 +02:00

..

acp

Merge branch '3.1.x'

2015-07-22 10:38:35 +02:00

diff

…

hooks

…

mcp

Merge branch '3.1.x'

2015-08-09 10:15:02 +02:00

questionnaire

…

ucp

Merge branch '3.1.x'

2015-08-22 10:41:46 +02:00

utf

…

.htaccess

…

bbcode.php

Merge pull request #3618 from marc1706/ticket/13832

2015-06-24 16:36:15 +02:00

compatibility_globals.php

[ticket/13740] Fix CS in compatibilty_globals.php

2015-07-24 17:36:04 +02:00

constants.php

[3.1.x] Update dev version to 3.1.6-RC1

2015-06-11 23:25:43 +02:00

functions_acp.php

Merge branch '3.1.x'

2015-06-07 14:59:33 +02:00

functions_admin.php

Merge branch '3.1.x'

2015-06-09 15:24:08 +02:00

functions_compatibility.php

Merge branch '3.1.x'

2015-06-16 12:35:51 +02:00

functions_compress.php

…

functions_content.php

[ticket/13377] Fix decoding for www type URLs in function decode_message()

2015-07-07 22:30:20 +07:00

functions_convert.php

Merge branch 'ticket/13930' into ticket/13930-master

2015-06-08 15:39:47 +02:00

functions_database_helper.php

…

functions_display.php

Merge branch '3.1.x'

2015-06-06 18:12:54 +02:00

functions_download.php

…

functions_install.php

…

functions_jabber.php

…

functions_mcp.php

…

functions_messenger.php

…

functions_module.php

Merge branch '3.1.x'

2015-05-30 10:58:40 +02:00

functions_posting.php

[ticket/8708] Apply permission 'f_announce_global'

2015-07-19 21:26:47 +02:00

functions_privmsgs.php

[ticket/11444] Moving the in-board notifications to a method class

2015-07-13 22:41:13 +02:00

functions_transfer.php

…

functions_upload.php

…

functions_user.php

Merge branch '3.1.x'

2015-06-21 21:53:03 +02:00

functions.php

Merge branch '3.1.x'

2015-08-09 10:31:43 +02:00

index.htm

…

message_parser.php

Merge branch '3.1.x'

2015-08-22 08:51:09 +02:00

sphinxapi.php

…

startup.php

Merge branch '3.1.x'

2015-06-09 21:27:56 +02:00