| commit | 1503c0f0ef8d9933418309cf742650b2c19c517d | [log] [tgz] |
|---|---|---|
| author | Felix Balfoort <fhjbalfoort@gmail.com> | Tue Nov 29 15:54:39 2011 +0100 |
| committer | Felix Balfoort <fhjbalfoort@gmail.com> | Tue Nov 29 15:54:39 2011 +0100 |
| tree | 70118d4a8979d2faf220483caf4aef7fb63f7194 | |
| parent | 5d581b6d664c6ef662bcb9572ca147ac17af52cb [diff] | |
| parent | ea6e466309887cef69f5685f97d17e6e6b335c2f [diff] |
Merge branch 'develop' of github.com:fhjbalfoort/CodeIgniter into develop Conflicts: application/config/database.php