Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

I

Infoscreen
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

d54f138d

Commit d54f138d authored 8 years ago by Hotte

Downloads
- Plain Diff

Merge branch 'dev' of bitbucket.org:FsInformatikDortmund/infoscreen into dev

Conflicts:
	config/layouts/default.json

parents ec121172 c1cc85a9

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

panels/werbung/img/Ankndigung_FVV.png 0 additions, 0 deletions

panels/werbung/img/Ankndigung_FVV.png
panels/werbung/img/DAT_2016_Flyer_DINA6.png 0 additions, 0 deletions

panels/werbung/img/DAT_2016_Flyer_DINA6.png
panels/werbung/img/itour2016_0.png 0 additions, 0 deletions

panels/werbung/img/itour2016_0.png
panels/werbung/script.js 12 additions, 7 deletions

panels/werbung/script.js

with 12 additions and 7 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment