Merge branch 'master' of birbmc.com:BirbMC/minecraft_manager into birb

Browse Source

# Conflicts:
#	external/views.py

pull/2/head

Etzelia 2021-03-15 21:11:12 -05:00

parent 675f7d13bd dead183dad

commit f91bab4006

No known key found for this signature in database

GPG Key ID: 708511AE7ABC5314

1 changed files with 48 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48

migrations/0014_auto_20190726_1201.py 100644

View File

File diff suppressed because one or more lines are too long