Skip to content
Snippets Groups Projects
Commit 6e8487db authored by Axel's avatar Axel
Browse files

Merge branch 'master' of https://github.com/juliandehne/fltrail

# Conflicts:
#	.idea/workspace.xml
#	studentview/.idea/workspace.xml
#	studentview/assets/js/Projekte.js
#	studentview/assets/js/myGroupsInit.js
#	studentview/assets/js/newProject.js
#	studentview/assets/js/overview.js
#	studentview/database/getProjects.php
#	studentview/pages/Projekte.html
#	studentview/pages/projects.php
parents 453274e7 b1590d83
No related branches found
No related tags found
No related merge requests found
Showing
with 1945 additions and 407 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment