Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
ARSnova Backend
Manage
Activity
Members
Labels
Plan
Issues
27
Issue boards
Milestones
Code
Merge requests
1
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Operate
Environments
Monitor
Incidents
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
ARSnova
ARSnova Backend
Commits
b4f02923
Commit
b4f02923
authored
11 years ago
by
Daniel Gerhardt
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' into issue-6674
Conflicts: src/main/webapp/WEB-INF/spring/spring-main.xml
parents
4ced0863
ef324c77
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
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
+1
-5
1 addition, 5 deletions
src/main/webapp/WEB-INF/spring/spring-main.xml
with
70 additions
and
24 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
