-
Merge branch 'v1.1.4.0' into v1.1.5.0 · e9b87aad
# Conflicts: # config.xml # package.json # src/app/app-routing.module.ts # src/app/app.component.ts # src/app/app.module.ts # src/app/app.scss # src/app/pages/menu/menu.page.html # src/app/pages/menu/menu.page.ts # src/app/pages/offres/offres-carte/offres-carte.page.ts
Nabil Sadki authored
×