Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

G

Géocontrib Frontend
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Redmine
- Terraform modules
- Contributor analytics
- Model experiments

Snippets Groups Projects

d22e9e50

Commit d22e9e50 authored 3 years ago by Florent Lavelle

Downloads
- Plain Diff

fix conflicts

parents 08fa5e5b ac50cfa4

No related branches found

No related tags found

2 merge requests!2162.3.2-rc2,!210REDMINE_ISSUE-12634 | Biblio de pictos

This commit is part of merge request !210. Comments created here will be created in the context of that merge request.

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

package.json 1 addition, 1 deletion

package.json
src/assets/js/map-util.js 5 additions, 2 deletions

src/assets/js/map-util.js
src/store/modules/feature.js 65 additions, 124 deletions

src/store/modules/feature.js
src/views/Index.vue 1 addition, 1 deletion

src/views/Index.vue
src/views/feature/Feature_edit.vue 22 additions, 6 deletions

src/views/feature/Feature_edit.vue
src/views/project/Project_detail.vue 4 additions, 0 deletions

src/views/project/Project_detail.vue

with 98 additions and 134 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment