diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-07-12 00:13:32 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-07-12 00:13:32 +0200 |
| commit | 3f0c02533aad96ead9597b96351c0fd6b0cf5178 (patch) | |
| tree | dee1f99211fe69c75f9cd8ca9006c888150ebb8a /phpBB/includes/acm | |
| parent | eeb65d2958fcccc1fd2ccfbf9e154b4e30052977 (diff) | |
| parent | 6724b799676562cfb8ade6e19c77cc9d8cb238c7 (diff) | |
| download | forums-3f0c02533aad96ead9597b96351c0fd6b0cf5178.tar forums-3f0c02533aad96ead9597b96351c0fd6b0cf5178.tar.gz forums-3f0c02533aad96ead9597b96351c0fd6b0cf5178.tar.bz2 forums-3f0c02533aad96ead9597b96351c0fd6b0cf5178.tar.xz forums-3f0c02533aad96ead9597b96351c0fd6b0cf5178.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9531] BBCode-less quotes fallback-option is missing "Author wrote:"
[ticket/9012] Adjust shadow topic title to the title at the time it was moved.
Conflicts:
phpBB/styles/subsilver2/template/editor.js
phpBB/styles/subsilver2/template/posting_topic_review.html
phpBB/styles/subsilver2/template/ucp_pm_history.html
Diffstat (limited to 'phpBB/includes/acm')
0 files changed, 0 insertions, 0 deletions