Skip to content

Commit

Permalink
Merge branch 'main' of github.com:sledilnik/website-backend into main
Browse files Browse the repository at this point in the history 
# Conflicts:
#	Pipfile.lock
  • Loading branch information
@joahim
joahim committed Mar 20, 2021
2 parents a470972 + 7fb065d commit f87fa5f
Showing 1 changed file with 66 additions and 74 deletions.
140 changes: 66 additions & 74 deletions Pipfile.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit f87fa5f

Please sign in to comment.