diff options
| author | Chris Smith <toonarmy@phpbb.com> | 2009-03-16 22:41:37 +0000 |
|---|---|---|
| committer | Chris Smith <toonarmy@phpbb.com> | 2009-03-16 22:41:37 +0000 |
| commit | d6ef1e47468a10ea4199978c1eac4cf0112ca449 (patch) | |
| tree | a67ed46cf838bb7e7a7bc7920e88cd80ab66371e /phpBB/docs | |
| parent | b933bc87e207a5e4c3ddf695e9b65fbb8dbb7079 (diff) | |
| download | forums-d6ef1e47468a10ea4199978c1eac4cf0112ca449.tar forums-d6ef1e47468a10ea4199978c1eac4cf0112ca449.tar.gz forums-d6ef1e47468a10ea4199978c1eac4cf0112ca449.tar.bz2 forums-d6ef1e47468a10ea4199978c1eac4cf0112ca449.tar.xz forums-d6ef1e47468a10ea4199978c1eac4cf0112ca449.zip | |
gah stupid conflict resolution :@ fix line ending in r9379
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9380 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/docs')
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index ab3f01af71..eb9c28ec85 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -862,4 +862,4 @@ </div> </body> -</html> +</html>
\ No newline at end of file |