Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
ARSnova Backend
Manage
Activity
Members
Labels
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Operate
Environments
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Privacy
Imprint
Contact
Snippets
Groups
Projects
Show more breadcrumbs
Paul-Christian Volkmer
ARSnova Backend
Commits
b2ebfaba
Commit
b2ebfaba
authored
11 years ago
by
Paul-Christian Volkmer
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' into ldap_integration
Conflicts: pom.xml src/main/webapp/WEB-INF/spring/spring-main.xml
parents
9df59b73
ef324c77
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
.travis.yml
+1
-0
1 addition, 0 deletions
.travis.yml
README.md
+54
-3
54 additions, 3 deletions
README.md
pom.xml
+15
-16
15 additions, 16 deletions
pom.xml
src/main/webapp/WEB-INF/spring/spring-main.xml
+3
-8
3 additions, 8 deletions
src/main/webapp/WEB-INF/spring/spring-main.xml
with
73 additions
and
27 deletions
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
