Marc Alexander 80768b526b Merge branch '3.1.x' ...

Conflicts:
	phpBB/phpbb/user_loader.php

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

..

auth

Merge branch '3.1.x'

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

avatar

…

cache

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

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

captcha

[ticket/13930] Add missing spaces to code

2015-06-07 22:53:41 +02:00

config

…

console

…

controller

…

cron

…

db

Merge branch '3.1.x'

2015-06-14 17:40:18 +02:00

di

…

event

…

exception

…

extension

…

feed

…

filesystem

…

groupposition

…

help

…

hook

…

language

[ticket/13896] Fix coding style

2015-05-30 12:27:31 +02:00

lock

…

log

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

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

message

…

mimetype

…

module

[ticket/13777] Remove module_class_not_defined_exception

2015-05-31 16:27:16 +02:00

notification

Merge branch '3.1.x'

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

passwords

[ticket/13917] Do not pass non-string variables to hash_equals()

2015-06-04 17:16:22 +02:00

php

…

plupload

…

profilefields

…

report

…

request

…

routing

[ticket/13388] Fix coding style

2015-05-30 13:14:27 +02:00

search

Merge pull request #3696 from marc1706/ticket/13930-master

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

template

Merge branch '3.1.x'

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

textformatter

…

tree

[ticket/13941] Workaround to fix the bug on php 5.5 with sqlite3

2015-06-13 13:20:55 +02:00

class_loader.php

…

composer.json

…

config_php_file.php

…

content_visibility.php

…

datetime.php

…

error_collector.php

…

file_downloader.php

…

filesystem.php

…

finder.php

…

json_response.php

…

pagination.php

…

path_helper.php

…

permissions.php

…

recursive_dot_prefix_filter_iterator.php

…

session.php

…

symfony_request.php

…

user_loader.php

Merge branch '3.1.x'

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

user.php

[ticket/13942] Check if path to language file contains language path

2015-06-13 17:15:28 +02:00

version_helper.php

…

viewonline_helper.php

…