| commit | c00a5a042341b8fe10d264ed1ea70177bc5e572d | [log] [tgz] |
|---|---|---|
| author | Phil Sturgeon <email@philsturgeon.co.uk> | Tue Nov 22 15:25:32 2011 +0000 |
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | Tue Nov 22 15:25:32 2011 +0000 |
| tree | 88be90e02c41de95868152b8f3107d03b0b53fb8 | |
| parent | c737c94b6dd2044b7c1a7d506c57de7da6df97f4 [diff] [blame] | |
| parent | 0199f68db46d375af2d4cb831c679d3040601f25 [diff] [blame] |
Merge master (2.1.0) and fixed conflicts.
diff --git a/application/config/migration.php b/application/config/migration.php index f568574..4fb027b 100644 --- a/application/config/migration.php +++ b/application/config/migration.php
@@ -90,5 +90,4 @@ $config['migration_path'] = APPPATH . 'migrations/'; -/* End of file migration.php */ -/* Location: ./application/config/migration.php */ \ No newline at end of file +/* End of file migration.php */ \ No newline at end of file