Merge branch 'master' into msp-team6-pq (ea1d6a71) · Commits · ARSnova / ARSnova Backend · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

ARSnova Backend
- Activity
- Members
- Labels
- Releases
- Environments
- Incidents

Snippets Groups Projects

ea1d6a71

Commit ea1d6a71 authored 10 years ago by

Christoph Thelen

Downloads
- Plain Diff

Merge branch 'master' into msp-team6-pq

parents 013a598c 2084f33a

Branches

Tags

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/de/thm/arsnova/web/CorsFilter.java 29 additions, 0 deletions

src/main/java/de/thm/arsnova/web/CorsFilter.java
src/main/webapp/WEB-INF/spring/arsnova-servlet.xml 49 additions, 42 deletions

src/main/webapp/WEB-INF/spring/arsnova-servlet.xml
src/main/webapp/WEB-INF/web.xml 9 additions, 0 deletions

src/main/webapp/WEB-INF/web.xml

with 87 additions and 42 deletions

0% 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