Merge branch '2.1' into 2.2 (15d2305d) · Commits · Paul-Christian Volkmer / ARSnova Backend · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

15d2305d

Commit 15d2305d authored 8 years ago by

Daniel Gerhardt

Downloads
- Plain Diff

Merge branch '2.1' into 2.2

parents d77c02da ac0612fb

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 16 additions, 0 deletions

CHANGELOG.md
pom.xml 5 additions, 5 deletions

pom.xml
src/main/java/de/thm/arsnova/web/CorsFilter.java 0 additions, 49 deletions

src/main/java/de/thm/arsnova/web/CorsFilter.java
src/main/webapp/WEB-INF/web.xml 0 additions, 10 deletions

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

with 21 additions and 64 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