|
Joas Schilling
|
3a2ccd079e10e066d2c96bc9a1f193dcfb7cc5d5
3a2ccd079e10e066d2c96bc9a1f193dcfb7cc5d5 |
Merge branch 'prep-release-3.1.0' into develop-ascraeus |
|
|
Joas Schilling
|
197fed16bd0fed828dabc433dac6e99028231556
m 197fed16bd0fed828dabc433dac6e99028231556 |
[prep-release-3.1.0] Update changelog with final changes |
|
|
Joas Schilling
|
c57fbe9d0dcbc72b80e4bab63566c8e4bd0ca16c
c57fbe9d0dcbc72b80e4bab63566c8e4bd0ca16c |
Merge branch 'prep-release-3.1.0' into develop-ascraeus |
|
|
Joas Schilling
|
12033bc4993cb5df68c284605152f41ed8448763
m 12033bc4993cb5df68c284605152f41ed8448763 |
Merge branch 'develop-olympus' into prep-release-3.1.0
Conflicts:
phpBB/phpbb/session.php |
|
|
Joas Schilling
|
71c19f6eb7dd26224445fec6b75c7b0e9bf21509
m 71c19f6eb7dd26224445fec6b75c7b0e9bf21509 |
Merge pull request #3091 from Nicofuma/ticket/13234-2
Ticket/13234 2 |
|