|
Marc
|
913223dca9719841c1ad750108f70fcc6959008e
913223dca9719841c1ad750108f70fcc6959008e |
Merge branch '3.3.x' |
|
|
Marc
|
3bd612ad8144e70680c539570ebd0d795c10ddf3
m 3bd612ad8144e70680c539570ebd0d795c10ddf3 |
Merge branch '3.2.x' into 3.3.x |
|
|
Marc
|
dcae4f330e9130a516875b8052f1f648f02b8d0e
m dcae4f330e9130a516875b8052f1f648f02b8d0e |
Merge pull request #5990 from 3D-I/ticket/16496
[ticket/16496] Fix html special chars in custom BBcode help line |
|
|
Marc
|
6c970be53c1b94d4b47e6d4a2558ee4630fc331b
6c970be53c1b94d4b47e6d4a2558ee4630fc331b |
Merge branch '3.3.x' |
|
|
Marc
|
642f990fbc8ddce1d26bcf1f5290e4fb280dd5c5
m 642f990fbc8ddce1d26bcf1f5290e4fb280dd5c5 |
Merge branch '3.2.x' into 3.3.x |
|