src/app/pages/offres/offres-carte · e9b87aad9d9f13dd6ee15bdc3dae0b787e5495d6 · Nabil Sadki / allo-app

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

authored Sep 26, 2019

e9b87aad

Name	Last commit	Last update
..
offres-carte.module.ts		Loading commit data...
offres-carte.page.html		Loading commit data...
offres-carte.page.scss		Loading commit data...
offres-carte.page.spec.ts		Loading commit data...
offres-carte.page.ts		Loading commit data...