Merge branch 'danielsFeatures' into 'master' (be83f87f) · Commits · fsini-informatik / fsfahrttool · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

fsfahrttool
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Incidents

Snippets Groups Projects

be83f87f

Commit be83f87f authored 6 years ago by Daniel Bucher

Downloads
- Plain Diff

Merge branch 'danielsFeatures' into 'master'

fixed reported issues

See merge request !5

parents 3103dc81 f9327d7b

No related branches found

No related tags found

1 merge request!5fixed reported issues

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

registration-system/admin/index.php 7 additions, 3 deletions

registration-system/admin/index.php
registration-system/admin/pages_list.php 1 addition, 2 deletions

registration-system/admin/pages_list.php
registration-system/admin/pages_overview.php 18 additions, 0 deletions

registration-system/admin/pages_overview.php
registration-system/config.inc.php 2 additions, 1 deletion

registration-system/config.inc.php
registration-system/frameworks/Bachelor.php 6 additions, 2 deletions

registration-system/frameworks/Bachelor.php
registration-system/view/default_admin.php 1 addition, 1 deletion

registration-system/view/default_admin.php
registration-system/view/signups/game1/js/story.js 8 additions, 2 deletions

registration-system/view/signups/game1/js/story.js

with 43 additions and 11 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

Impressum | Datenschutzerklärung