Merge develop
This commit is contained in:
commit
b6b5b16ba4
86 changed files with 2196 additions and 338 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -10,6 +10,7 @@
|
|||
/test/tmp/
|
||||
/doc
|
||||
/instance
|
||||
/priv/ssh_keys
|
||||
|
||||
# Prevent committing custom emojis
|
||||
/priv/static/emoji/custom/*
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue