jekkos 67d9ca1e41 Merge branch 'master' into develop/2.4 ...

Conflicts:
	Dockerfile

2016-01-29 17:34:53 +01: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

Upgrade to CI 3.0.4 (#120)

2016-01-17 18:33:26 +00:00

controllers

Added comments to some controller functions and improved spacing to improve readibility of code (#120)

2016-01-17 17:56:54 +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 branch 'master' into develop/2.4

2016-01-29 17:34:53 +01: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