diff options
author | Dhruv <dhruv.goel92@gmail.com> | 2013-06-20 21:39:13 +0530 |
---|---|---|
committer | Dhruv <dhruv.goel92@gmail.com> | 2013-06-20 21:39:13 +0530 |
commit | 116888f567a26e367de4f3c138d3a806ba16d1d8 (patch) | |
tree | 68bfbcad71909d8b5a6806ebdc29785116efa1c1 /phpBB/styles/prosilver/template/editor.js | |
parent | 30801e1f0a9aab6a3b4e589be1e43309543e8293 (diff) | |
parent | 8a2063090c382445835e64fb95ad3aebd777e146 (diff) | |
download | forums-116888f567a26e367de4f3c138d3a806ba16d1d8.tar forums-116888f567a26e367de4f3c138d3a806ba16d1d8.tar.gz forums-116888f567a26e367de4f3c138d3a806ba16d1d8.tar.bz2 forums-116888f567a26e367de4f3c138d3a806ba16d1d8.tar.xz forums-116888f567a26e367de4f3c138d3a806ba16d1d8.zip |
Merge branch 'ticket/10776' of git://github.com/callumacrae/phpbb3 into ticket/10776
# By Callum Macrae
# Via Callum Macrae
* 'ticket/10776' of git://github.com/callumacrae/phpbb3:
[ticket/10776] Fixed a couple language changes in docs/README.html.
[ticket/10776] Fixed errors in docs/README.html.
Conflicts:
phpBB/docs/README.html
Diffstat (limited to 'phpBB/styles/prosilver/template/editor.js')
0 files changed, 0 insertions, 0 deletions