Skip to content
Snippets Groups Projects
Commit 8a6676b2 authored by 2deep4real's avatar 2deep4real
Browse files

Merge branch 'dev' of 

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

Conflicts:
	panels/departure/config/oh14.json
parents 497d0b53 988b701b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 61 additions and 42 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment