jekkos e8a96054ee Merge branch 'master' into feature/composer ...

Conflicts:
	dist/opensourcepos.min.js
	public/license/LICENSES

2016-08-24 16:25:55 +02:00

..

cache

…

config

Install CI langauges in system/language as before (#624)

2016-08-18 13:33:02 +02:00

controllers

Merge branch 'feature/composer' of https://github.com/jekkos/opensourcepos into feature/composer

2016-08-23 18:28:50 +02:00

core

Change project layout for composer (#624)

2016-08-18 13:33:01 +02:00

helpers

Install CI langauges in system/language as before (#624)

2016-08-18 13:33:02 +02:00

hooks

Install CI langauges in system/language as before (#624)

2016-08-18 13:33:02 +02:00

language

Install CI langauges in system/language as before (#624)

2016-08-18 13:33:02 +02:00

libraries

Install CI langauges in system/language as before (#624)

2016-08-18 13:33:02 +02:00

logs

…

models

Fixed Item exists where issue (#666)

2016-08-02 17:25:49 +01:00

third_party

…

views

Merge branch 'master' into feature/composer

2016-08-24 16:25:55 +02:00

.htaccess

…

index.html

…