diff options
author | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-08-10 17:00:13 +0200 |
---|---|---|
committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-08-13 19:28:56 +0200 |
commit | dd9b763ef18808637680237d78d8698799ccf8fa (patch) | |
tree | 7642642fb2b19349c9722ddf16a771a04de049f3 /user_guide/changelog.html | |
parent | fe1d45a023b08753f4c5f1d908d54ae842277558 (diff) |
Fixed conflicts.
Diffstat (limited to 'user_guide/changelog.html')
-rw-r--r-- | user_guide/changelog.html | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 9bebb7044..783c9d3d1 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -74,6 +74,8 @@ Change Log <li>Removed internal usage of the <samp>EXT</samp> constant.</li> <li>Visual updates to the welcome_message view file and default error templates. Thanks to <a href="https://bitbucket.org/danijelb">danijelb</a> for the pull request.</li> <li class="reactor">Added <samp>insert_batch()</samp> function to the PostgreSQL database driver. Thanks to epallerols for the patch.</li> + <li class="reactor">Added "application/x-csv" to mimes.php.</li> + </ul> </li> <li>Helpers |