FrancescoUK a3929d2c6f Merge remote-tracking branch 'jekkos/master' into ci3 ...

# Conflicts:
#	application/config/database.php.tmpl

2016-01-15 18:57:11 +00:00

..

cache

Complete CI 3.0.3 upgrade since it wasn't done in full (#120)

2016-01-07 20:16:59 +00:00

config

PHP7 fix

2016-01-13 15:58:20 +08:00

controllers

Complete CI 3.0.3 upgrade since it wasn't done in full (#120)

2016-01-07 20:16:59 +00:00

core

Merge remote-tracking branch 'jekkos/master' into ci3

2016-01-15 18:57:11 +00:00

helpers

Complete CI 3.0.3 upgrade since it wasn't done in full (#120)

2016-01-07 20:16:59 +00:00

hooks

Complete CI 3.0.3 upgrade since it wasn't done in full (#120)

2016-01-07 20:16:59 +00:00

language

Merge branch 'master' #274 change into ci3

2016-01-10 13:13:55 +00:00

libraries

Complete CI 3.0.3 upgrade since it wasn't done in full (#120)

2016-01-07 20:16:59 +00:00

logs

Complete CI 3.0.3 upgrade since it wasn't done in full (#120)

2016-01-07 20:16:59 +00:00

models

Complete CI 3.0.3 upgrade since it wasn't done in full (#120)

2016-01-07 20:16:59 +00:00

third_party

Complete CI 3.0.3 upgrade since it wasn't done in full (#120)

2016-01-07 20:16:59 +00:00

views

Merge remote-tracking branch 'jekkos/master' into ci3

2016-01-15 18:57:11 +00:00

.htaccess

Complete CI 3.0.3 upgrade since it wasn't done in full (#120)

2016-01-07 20:16:59 +00:00

index.html

Complete CI 3.0.3 upgrade since it wasn't done in full (#120)

2016-01-07 20:16:59 +00:00