js

410 commits behind the upstream repository.

2deep4real authored Sep 14, 2015

git@bitbucket.org:FsInformatikDortmund/infoscreen.git into dev

Conflicts:
	panels/departure/config/oh14.json

8a6676b2

Code owners

Assign users and groups as approvers for specific file changes. Learn more.