Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

MaarchCourrier
- Activity
- Members
- Labels
- Incidents

Snippets Groups Projects

464a8eab

Commit 464a8eab authored 4 years ago by Arnaud Pauget

Downloads
- Plain Diff

Merge branch 'develop' of https://labs.maarch.org/maarch/MaarchCourrier into develop

parents d3ee377a c405a936

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

migration/20.10/2010.sql 4 additions, 1 deletion

migration/20.10/2010.sql
src/app/resource/controllers/ResourceListController.php 3 additions, 0 deletions

src/app/resource/controllers/ResourceListController.php
src/app/search/controllers/SearchController.php 6 additions, 2 deletions

src/app/search/controllers/SearchController.php
src/app/search/models/SearchModel.php 4 additions, 2 deletions

src/app/search/models/SearchModel.php

with 17 additions and 5 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