version finale r�vis�e
ok
ok
Merge branch 'gh-pages' of https://github.com/douarime/protoDoc into gh-pages

Conflicts:

	docs/build/doctrees/pages/menu_principal.doctree
	docs/build/doctrees/pages/option_champs.doctree
	docs/build/doctrees/pages/option_configuration.doctree
	docs/build/doctrees/pages/option_details.doctree
	docs/build/doctrees/pages/option_formulaire.doctree
	docs/build/doctrees/pages/option_meta.doctree
	docs/build/doctrees/pages/organisation_interface.doctree
	docs/build/html/.buildinfo
	docs/build/html/genindex.html
	docs/build/html/images/classer.png
	docs/build/html/images/imprimer.png
	docs/build/html/images/interface.png
	docs/build/html/images/messages.png
	docs/build/html/images/messages2.png
	docs/build/html/index.html
	docs/build/html/objects.inv
	docs/build/html/pages/creer_entite.html
	docs/build/html/pages/creer_modele.html
	docs/build/html/pages/creer_projet.html
	docs/build/html/pages/creer_propriete.html
	docs/build/html/pages/creer_relation.html
	docs/build/html/pages/demarche_prototypage.html
	docs/build/html/pages/generer_modele_conceptuel_graphique.html
	docs/build/html/pages/menu_principal.html
	docs/build/html/pages/option_champs.html
	docs/build/html/pages/option_configuration.html
	docs/build/html/pages/option_details.html
	docs/build/html/pages/option_formulaire.html
	docs/build/html/pages/option_meta.html
	docs/build/html/pages/organisation_interface.html
	docs/build/html/search.html
	docs/build/html/searchindex.js
	docs/build/html/sources/index.txt
	docs/build/html/sources/pages/creer_entite.txt
	docs/build/html/sources/pages/creer_modele.txt
	docs/build/html/sources/pages/creer_projet.txt
	docs/build/html/sources/pages/creer_propriete.txt
	docs/build/html/sources/pages/creer_relation.txt
	docs/build/html/sources/pages/demarche_prototypage.txt
	docs/build/html/sources/pages/generer_modele_conceptuel_graphique.txt
	docs/build/html/sources/pages/menu_principal.txt
	docs/build/html/sources/pages/option_champs.txt
	docs/build/html/sources/pages/option_configuration.txt
	docs/build/html/sources/pages/option_details.txt
	docs/build/html/sources/pages/option_formulaire.txt
	docs/build/html/sources/pages/option_meta.txt
	docs/build/html/sources/pages/organisation_interface.txt
	docs/build/html/static/jquery.js
	docs/build/html/static/searchtools.js
	docs/build/html/static/websupport.js
	docs/gh-pages.sh
	docs/remp.py
	docs/source/conf.py
	docs/source/index.rst
	docs/source/pages/creer_entite.rst
	docs/source/pages/creer_modele.rst
	docs/source/pages/creer_projet.rst
	docs/source/pages/creer_propriete.rst
	docs/source/pages/creer_relation.rst
	docs/source/pages/demarche_prototypage.rst
	docs/source/pages/generer_modele_conceptuel_graphique.rst
	docs/source/pages/images/Thumbs.db
	docs/source/pages/images/classer.png
	docs/source/pages/images/imprimer.png
	docs/source/pages/images/interface.png
	docs/source/pages/images/messages.png
	docs/source/pages/images/messages2.png
	docs/source/pages/menu_principal.rst
	docs/source/pages/option_champs.rst
	docs/source/pages/option_configuration.rst
	docs/source/pages/option_details.rst
	docs/source/pages/option_formulaire.rst
	docs/source/pages/option_meta.rst
	docs/source/pages/organisation_interface.rst
	index.html
conflit
Merge branch 'gh-pages' of https://github.com/douarime/protoDoc into gh-pages
version finale