diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-06-09 22:57:33 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-06-09 22:57:33 +0200 |
| commit | 592624379f910022e0707c69125c1a220e2e8bfa (patch) | |
| tree | e547ae16a5524572985097915931536b5b9a4c50 /phpBB/phpbb/controller | |
| parent | 7a55594e93eccf8642a11b45922848176ee44a25 (diff) | |
| parent | 771cbb2b3a8d025dc1b9453227efdb726399d9d1 (diff) | |
| download | forums-592624379f910022e0707c69125c1a220e2e8bfa.tar forums-592624379f910022e0707c69125c1a220e2e8bfa.tar.gz forums-592624379f910022e0707c69125c1a220e2e8bfa.tar.bz2 forums-592624379f910022e0707c69125c1a220e2e8bfa.tar.xz forums-592624379f910022e0707c69125c1a220e2e8bfa.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/8610] Use css selector instead of xPath
[ticket/8610] Add functional test when two topics are merged
[ticket/8610] Throw an error when the dest topic isn't set
[ticket/8610] Fix bookmarks when merging all the posts of a topic
[ticket/8610] Merging topics does not handle bookmarks correctly
Diffstat (limited to 'phpBB/phpbb/controller')
0 files changed, 0 insertions, 0 deletions