Merge branch '2.0' into 2.1 (b50efa39) · 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

b50efa39

Commit b50efa39 authored 8 years ago by

Daniel Gerhardt

Downloads
- Plain Diff

Merge branch '2.0' into 2.1

parents fe8bcd91 87c1069d

Branches

Tags

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 8 additions, 0 deletions

CHANGELOG.md
pom.xml 7 additions, 7 deletions

pom.xml
src/main/java/de/thm/arsnova/web/CorsFilter.java 0 additions, 46 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 15 additions and 63 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