mirror of
https://github.com/wekan/wekan.git
synced 2025-12-16 07:20:12 +01:00
resolving merge conflicts
This commit is contained in:
commit
9518a5c11e
30 changed files with 880 additions and 58 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -15,3 +15,4 @@ package-lock.json
|
|||
**/prime
|
||||
**/*.snap
|
||||
snap/.snapcraft/
|
||||
.idea
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue