Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
I
ippidb-web
Manage
Activity
Members
Labels
Code
Merge requests
1
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Operate
Environments
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
iPPIDB
ippidb-web
Commits
800b340a
Commit
800b340a
authored
7 years ago
by
Rachel TORCHET
Browse files
Options
Downloads
Plain Diff
resolve conflict
Former-commit-id: 4ed03cc594e1a69601c013110068bb373d3bd3ba
parents
aaf037bc
d180f425
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
ansible/deploy.yaml
+13
-2
13 additions, 2 deletions
ansible/deploy.yaml
ippisite/ippidb/views.py
+2
-0
2 additions, 0 deletions
ippisite/ippidb/views.py
with
15 additions
and
2 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
