# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#	modified:   .idea/akuma.iml
#	modified:   .idea/workspace.xml
#	modified:   src/Mng/IndexBundle/Controller/FrontController.php
#	modified:   src/Mng/IndexBundle/Resources/views/Front/index.html.twig
#	modified:   src/Mng/UploadBundle/Form/CollectionType.php
#	modified:   src/Mng/UploadBundle/Resources/views/Collection/edit.html.twig
#	modified:   src/Mng/UploadBundle/Resources/views/Collection/new.html.twig
#	modified:   src/Site/AuteursBundle/Controller/AuteurController.php
#	modified:   src/Site/AuteursBundle/Form/AuteurType.php
#	modified:   src/Site/MangaBundle/Controller/MangaController.php
#	modified:   src/Site/MangaBundle/Entity/Manga.php
#	modified:   src/Site/MangaBundle/Form/MangaType.php
#	modified:   src/Site/MangaBundle/Resources/translations/messages.en.yml
#	modified:   src/Site/MangaBundle/Resources/translations/messages.fr.yml
#	modified:   src/Site/MangaBundle/Resources/views/Manga/Back/edit.html.twig
#	modified:   src/Site/MangaBundle/Resources/views/Manga/Back/new.html.twig
#
Merge remote-tracking branch 'origin/master'