mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-18 16:11:06 +02:00
Code Issues Releases Wiki Activity
Files
e7ce7ecbe79b036a9cf7dab9ea343efd0d47e1a7
php-phpbb/phpBB
History
Marc Alexander e7ce7ecbe7 Merge branch '3.1.x' into 3.2.x 
Conflicts:
	phpBB/config/feed.yml
	phpBB/feed.php
	phpBB/phpbb/feed/base.php
2016-07-17 22:09:53 +02:00
..
adm
Merge branch '3.1.x' into 3.2.x
2016-06-19 18:25:16 +02:00
assets
Merge pull request #4021 from marc1706/ticket/14272
2016-03-27 13:34:17 +02:00
bin
[ticket/13616] Fix UI tests
2016-04-03 16:23:16 +02:00
cache
…
config
Merge branch '3.1.x' into 3.2.x
2016-07-17 22:09:53 +02:00
develop
…
docs
Merge pull request #4311 from Crizz0/ticket/14620
2016-07-17 17:52:05 +02:00
download
…
ext
…
files
…
images
…
includes
Merge branch '3.1.x' into 3.2.x
2016-07-17 15:54:15 +02:00
install
[ticket/14671] Remove schema.json file
2016-07-02 20:15:01 +04:00
language
Merge branch '3.1.x' into 3.2.x
2016-07-17 15:57:28 +02:00
phpbb
Merge branch '3.1.x' into 3.2.x
2016-07-17 22:09:53 +02:00
store
…
styles
Merge branch '3.1.x' into 3.2.x
2016-07-16 21:25:17 +02:00
.htaccess
…
app.php
…
common.php
[ticket/13616] Fix UI tests
2016-04-03 16:23:16 +02:00
composer.json
[ticket/14706] Updated [list] BBCode to automatically create a list item
2016-07-08 07:49:10 +02:00
composer.lock
[ticket/14706] Updated [list] BBCode to automatically create a list item
2016-07-08 07:49:10 +02:00
cron.php
Merge branch '3.1.x' into 3.2.x
2016-05-28 09:59:50 +02:00
faq.php
…
feed.php
[ticket/14688] Add core events to the feeds
2016-07-17 21:14:13 +07:00
index.php
…
mcp.php
…
memberlist.php
Merge branch '3.1.x' into 3.2.x
2016-03-30 10:04:33 +02:00
posting.php
Merge branch '3.1.x' into 3.2.x
2016-04-03 16:34:43 +02:00
report.php
…
search.php
Merge branch '3.1.x' into 3.2.x
2016-07-17 15:52:41 +02:00
ucp.php
…
viewforum.php
Merge branch '3.1.x' into 3.2.x
2016-07-17 11:06:50 +02:00
viewonline.php
Merge branch '3.1.x' into 3.2.x
2016-02-13 18:08:01 +01:00
viewtopic.php
Merge pull request #4190 from marc1706/ticket/14437
2016-03-25 11:48:29 +01:00
web.config
[ticket/14587] Remove sectionGroup from web.config
2016-04-07 17:20:34 -04:00