paolo d689953b83 Merge origin/ci into ci ...

Conflicts:
	application/config/rest.php
	application/controllers/api/v1/APIAuth.php

2016-04-11 17:35:14 +02:00

..

cache

CI Init

2016-02-29 16:51:21 +01:00

config

Authentication working with LDAP

2016-04-11 17:23:51 +02:00

controllers

Merge origin/ci into ci

2016-04-11 17:35:14 +02:00

core

Shit

2016-04-07 15:17:26 +02:00

helpers

Acceptance Tests

2016-04-10 18:11:09 +02:00

hooks

CI Init

2016-02-29 16:51:21 +01:00

language

Message

2016-04-05 09:36:24 +02:00

libraries

Authentication working with LDAP

2016-04-11 17:23:51 +02:00

logs

CI Init

2016-02-29 16:51:21 +01:00

migrations

CodeCeption

2016-04-11 07:08:46 +02:00

models

merging message model

2016-04-11 10:05:19 +02:00

seeds

Acceptance Tests

2016-04-10 18:11:09 +02:00

third_party

CI Init

2016-02-29 16:51:21 +01:00

views

Acceptance Tests

2016-04-10 18:11:09 +02:00

index.html

CI Init

2016-02-29 16:51:21 +01:00