ok sans ras
notif manuelle
Merge branch 'master' of https://github.com/KiGniark/TradeAndGo

Conflicts:
	app/src/main/java/josiane/tradeandgo/app/synthese/Synthese.java
	app/src/main/java/josiane/tradeandgo/app/synthese/obj/Portefeuille.java
	app/src/main/java/josiane/tradeandgo/app/synthese/obj/Titre.java
	app/src/main/res/values/strings.xml
bis
Merge branch 'master' of https://github.com/KiGniark/TradeAndGo

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/josiane/tradeandgo/app/synthese/Synthese.java