Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into app_store
Browse files Browse the repository at this point in the history
  • Loading branch information
Archmonger committed Jul 5, 2022
2 parents 8de6fa3 + a7cc97b commit 61a7b3d
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
4 changes: 3 additions & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,12 @@ repos:
hooks:
- id: black
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: "v4.1.0"
rev: "v4.3.0"
hooks:
- id: end-of-file-fixer
exclude: >-
^docs/[^/]*\.svg$
- id: requirements-txt-fixer
- id: trailing-whitespace
types: [python]
Expand Down Expand Up @@ -65,6 +66,7 @@ repos:
- id: rst-linter
files: >-
^[^/]+[.]rst$
- repo: https://github.com/adrienverge/yamllint
rev: "v1.26.3"
hooks:
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.20.44
0.20.45
10 changes: 5 additions & 5 deletions requirements/main.txt
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
channels==3.0.4
channels==3.0.5
diskcache==5.4.0
django==4.0.4
django==4.0.6
django-ace==1.0.11
django-cleanup==6.0.0
django-colorfield==0.6.3
django-compression-middleware==0.4.1
django-compressor==3.1
django-compressor==4.0
django-crispy-forms==1.14.0
django-downloadview==2.3.0
django-health-check==3.16.5
django-idom==1.1.0
django-jazzmin==2.4.9
django-multiselectfield==0.1.12
django-searchable-encrypted-fields==0.1.9
django-silk==4.3.0
django-silk==5.0.1
django-solo==2.0.0
django-split-settings==1.1.0
django-tables2==2.4.1
Expand All @@ -24,7 +24,7 @@ docutils==0.18.1
drf-spectacular[sidecar]==0.21.2
huey==2.4.3
hypercorn[h3]==0.13.2
markdown==3.3.6
markdown==3.3.7
pillow==9.0.1
psutil==5.8.0
pymysql==1.0.2
Expand Down

0 comments on commit 61a7b3d

Please sign in to comment.