Commit graph

8 commits

Author SHA1 Message Date
Jean-Christophe Saad-Dupuy 5e07dc8b51 Merge remote branch 'upstream/dev' into dev
Conflicts:
	themes/default/_head.twig
2013-10-07 14:25:24 +02:00
Nicolas Lœuillet 031df528b6 bug fix #268: move POCHE_VERSION in index.php and change the name to avoid conflicts when updating 2013-10-07 13:19:34 +02:00
Jean-Christophe Saad-Dupuy 2916d24b20 Added support for custom SSL port 2013-10-07 12:47:13 +02:00
Nicolas Lœuillet 8f91e10faa preparing to 1.0.0 2013-10-03 14:51:04 +02:00
Nicolas Lœuillet 92cd6e9af8 change import files constants 2013-09-21 21:44:49 +02:00
Nicolas Lœuillet 37527034ab unactivate debug 2013-09-21 14:18:28 +02:00
Nicolas Lœuillet 5801355cbc chmod & mail address 2013-09-20 11:04:36 +02:00
Nicolas Lœuillet 00dbaf90bc merge #224 2013-09-20 10:21:39 +02:00