Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

MaarchCourrier
- Activity
- Members
- Labels
- Incidents

Snippets Groups Projects

da197928

Commit da197928 authored 7 years ago by Nathan Cheval

Downloads
- Plain Diff

Merge branch 'develop' into 'user_quota'

# Conflicts:
#   apps/maarch_entreprise/js/angular/lang/lang-en.js
#   apps/maarch_entreprise/js/angular/lang/lang-en.ts

parents fde368df 34ecd89b

No related branches found

No related tags found

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

apps/maarch_entreprise/js/angular/lang/lang-en.js 1 addition, 0 deletions

apps/maarch_entreprise/js/angular/lang/lang-en.js
apps/maarch_entreprise/js/angular/lang/lang-en.ts 28 additions, 27 deletions

apps/maarch_entreprise/js/angular/lang/lang-en.ts
modules/content_management/dist/maarchCM.jar 0 additions, 0 deletions

modules/content_management/dist/maarchCM.jar
modules/content_management/dist/not_signed/maarchCM.jar 0 additions, 0 deletions

modules/content_management/dist/not_signed/maarchCM.jar
modules/content_management/dist/src/MaarchCM.java 9 additions, 5 deletions

modules/content_management/dist/src/MaarchCM.java
modules/folder/class/class_admin_foldertypes_Abstract.php 4 additions, 3 deletions

modules/folder/class/class_admin_foldertypes_Abstract.php
package-lock.json 6 additions, 6 deletions

package-lock.json
package.json 2 additions, 2 deletions

package.json
sql/structure.sql 0 additions, 99 deletions

sql/structure.sql

with 50 additions and 142 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