diff options
| author | Timothy Warren <tim@timshomepage.net> | 2012-05-24 13:55:45 +0200 |
|---|---|---|
| committer | Timothy Warren <tim@timshomepage.net> | 2012-05-24 13:55:45 +0200 |
| commit | 6763522d29416b7db90a6d3c5dceffe1536d8efe (patch) | |
| tree | a8694c530b4467f496eeeba5fcd25c08654d4919 /application | |
| parent | ae9475557c1968826aee0fa5554899c8329412c2 (diff) | |
| parent | 13a9bf472f548463682d4d3fafce146b9a9ced3c (diff) | |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into email
Diffstat (limited to 'application')
| -rw-r--r-- | application/views/errors/error_404.php (renamed from application/errors/error_404.php) | 0 | ||||
| -rw-r--r-- | application/views/errors/error_db.php (renamed from application/errors/error_db.php) | 0 | ||||
| -rw-r--r-- | application/views/errors/error_general.php (renamed from application/errors/error_general.php) | 0 | ||||
| -rw-r--r-- | application/views/errors/error_php.php (renamed from application/errors/error_php.php) | 0 | ||||
| -rw-r--r-- | application/views/errors/index.html (renamed from application/errors/index.html) | 0 |
5 files changed, 0 insertions, 0 deletions
diff --git a/application/errors/error_404.php b/application/views/errors/error_404.php index c19bedfcd..c19bedfcd 100644 --- a/application/errors/error_404.php +++ b/application/views/errors/error_404.php diff --git a/application/errors/error_db.php b/application/views/errors/error_db.php index 3b244e094..3b244e094 100644 --- a/application/errors/error_db.php +++ b/application/views/errors/error_db.php diff --git a/application/errors/error_general.php b/application/views/errors/error_general.php index c88afe168..c88afe168 100644 --- a/application/errors/error_general.php +++ b/application/views/errors/error_general.php diff --git a/application/errors/error_php.php b/application/views/errors/error_php.php index b76dc8a9e..b76dc8a9e 100644 --- a/application/errors/error_php.php +++ b/application/views/errors/error_php.php diff --git a/application/errors/index.html b/application/views/errors/index.html index c942a79ce..c942a79ce 100644 --- a/application/errors/index.html +++ b/application/views/errors/index.html |