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

3f9899b3

Commit 3f9899b3 authored 3 years ago by Florent

Downloads
- Plain Diff

fix conflicts

parents 73322f0a 285391d6

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

public/config/config.json 2 additions, 0 deletions

public/config/config.json
src/App.vue 44 additions, 27 deletions

src/App.vue
src/services/feature-api.js 2 additions, 2 deletions

src/services/feature-api.js
src/store/index.js 4 additions, 27 deletions

src/store/index.js
src/views/feature/Feature_detail.vue 2 additions, 2 deletions

src/views/feature/Feature_detail.vue
src/views/feature_type/Feature_type_detail.vue 12 additions, 12 deletions

src/views/feature_type/Feature_type_detail.vue
src/views/project/Project_edit.vue 59 additions, 29 deletions

src/views/project/Project_edit.vue

with 125 additions and 99 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