Skip to content
Snippets Groups Projects
Select Git revision
  • 2301.4.x protected
  • 24.0.x
  • 24.x.x
  • main default protected
  • 2301.x.x protected
  • 2301.3.x
  • 21.03 protected
  • 2301.2.x
  • 20.03 protected
  • 20.10 protected
  • 19.04 protected
  • 18.10 protected
  • 18.04 protected
  • 17.06 protected
  • CMIS
  • 2301.4.7
  • 2301.4.6
  • 2301.4.5
  • 2301.4.4
  • 24.0.2
  • 2301.4.3
  • 2301.4.2
  • 2301.4.1
  • 2301.4.0
  • 2301.3.7
  • 2301.3.6
  • 21.03.33
  • 2301.3.5
  • 2301.3.4
  • 2301.3.3
  • 2301.3.2
  • 2301.3.1
  • 2301.3.0
  • 2301.2.2
  • 2301.2.1
35 results
Blame Permalink
  • Florian Azizian's avatar
    c591a0b8
    Merge branch 'develop' into Rookies · c591a0b8
    Florian Azizian authored 
    Conflicts:
	apps/maarch_entreprise/js/angular/app/app.module.js
	apps/maarch_entreprise/js/angular/app/app.module.ts
	apps/maarch_entreprise/js/angular/app/profile.component.js
	apps/maarch_entreprise/js/angular/app/profile.component.ts
	apps/maarch_entreprise/js/angular/main.bundle.min.js
	apps/maarch_entreprise/lang/en.php
	apps/maarch_entreprise/merged_css.php
	apps/maarch_entreprise/merged_jsAbstract.php
	core/Models/LangModelAbstract.php
	modules/basket/Models/BasketsModelAbstract.php
    c591a0b8
    History
    Merge branch 'develop' into Rookies
    Florian Azizian authored 
    Conflicts:
	apps/maarch_entreprise/js/angular/app/app.module.js
	apps/maarch_entreprise/js/angular/app/app.module.ts
	apps/maarch_entreprise/js/angular/app/profile.component.js
	apps/maarch_entreprise/js/angular/app/profile.component.ts
	apps/maarch_entreprise/js/angular/main.bundle.min.js
	apps/maarch_entreprise/lang/en.php
	apps/maarch_entreprise/merged_css.php
	apps/maarch_entreprise/merged_jsAbstract.php
	core/Models/LangModelAbstract.php
	modules/basket/Models/BasketsModelAbstract.php