Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

U

url_shorter_docker
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

399a10dc

Commit 399a10dc authored 5 years ago by Jonas Leder

Downloads
- Plain Diff

Merge branch 'master' into beta

parents 4e84debd 3b6613be

Branches

Tags

No related merge requests found

Changes 12

Show whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 5 additions, 3 deletions

.gitlab-ci.yml
Dockerfile 2 additions, 3 deletions

Dockerfile
VERSION 1 addition, 1 deletion

VERSION
docker-compose-build.yml 3 additions, 2 deletions

docker-compose-build.yml
docker-compose.yml 2 additions, 0 deletions

docker-compose.yml
export.py 5 additions, 4 deletions

export.py
import.py 5 additions, 3 deletions

import.py
main.py 107 additions, 14 deletions

main.py
requirements.txt 7 additions, 0 deletions

requirements.txt
static/style.css 36 additions, 1 deletion

static/style.css
templates/editEntries.html 16 additions, 0 deletions

templates/editEntries.html
templates/home.html 3 additions, 2 deletions

templates/home.html

with 192 additions and 33 deletions

Loading

0% Loading 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