Merge branch '2.2' into 2.3 (d320eeb9) · 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

d320eeb9

Commit d320eeb9 authored 8 years ago by

Daniel Gerhardt

Downloads
- Plain Diff

Merge branch '2.2' into 2.3

parents e153cdf4 ac38380b

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 24 additions, 0 deletions

CHANGELOG.md
pom.xml 1 addition, 1 deletion

pom.xml
src/main/java/de/thm/arsnova/config/ExtraConfig.java 10 additions, 0 deletions

src/main/java/de/thm/arsnova/config/ExtraConfig.java
src/main/java/de/thm/arsnova/web/CorsFilter.java 41 additions, 25 deletions

src/main/java/de/thm/arsnova/web/CorsFilter.java
src/main/resources/arsnova.properties.example 9 additions, 0 deletions

src/main/resources/arsnova.properties.example
src/main/webapp/WEB-INF/web.xml 1 addition, 1 deletion

src/main/webapp/WEB-INF/web.xml
src/test/resources/arsnova.properties.example 9 additions, 0 deletions

src/test/resources/arsnova.properties.example

with 95 additions and 27 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