# Conflicts:
#   .gitlab-ci.yml
#   deploy.sh

switch to using script

See merge request !9

# Conflicts:
#   .gitlab-ci.yml

add print infos

See merge request !8

add bare-metal tag

See merge request !7

Add routes for creating or updating users.

See merge request !3

# Conflicts:
#   requirements.txt

Pipe import academic

See merge request !4

# Conflicts:
#   requirements.txt

deal with academic items

See merge request !2