Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

MaarchCourrier
- Activity
- Members
- Labels
- Incidents

Snippets Groups Projects

8f746484

Commit 8f746484 authored 5 years ago by Guillaume Heurtier

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/develop' into develop

parents 0342ab2e d44e825c

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

rest/index.php 1 addition, 1 deletion

rest/index.php
src/app/folder/controllers/FolderController.php 5 additions, 13 deletions

src/app/folder/controllers/FolderController.php
src/app/resource/controllers/ResourceListController.php 1 addition, 2 deletions

src/app/resource/controllers/ResourceListController.php
src/frontend/app/folder/folder-action-list/folder-action-list.component.ts 3 additions, 80 deletions

...folder/folder-action-list/folder-action-list.component.ts

with 10 additions and 96 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