Skip to content
Snippets Groups Projects
Commit 08d6f0cf authored by Anthony's avatar Anthony
Browse files

Fix merge

parent 09931635
No related branches found
No related tags found
1 merge request!9Antoine plugin with mui5 react17
Pipeline #1655 canceled
Stage: test
Hide whitespace changes
Inline Side-by-side
.gitignore
+ 2
− 1
View file @ 08d6f0cf
......@@ -6,4 +6,5 @@
/umd
npm-debug.log*
.idea
.package-lock.json
```
mirador @ 3def696e
Subproject commit 3e696d63f5425975a23435e8c25eada9bb42542d
Subproject commit 3def696e0a9014bbfb444a6770533771492c2d26
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment