Antonin 0505ab6bb2 Merge remote-tracking branch 'upstream/develop' into develop ... Conflicts: app/classes/Framadate/Utils.php		2015-04-13 16:16:02 +02:00
..
Migration	From double quote to simple quote	2015-04-07 17:40:20 +02:00
Repositories	Fixes after merge	2015-04-07 23:17:26 +02:00
Security	Using more secure token	2015-04-02 12:03:28 +02:00
Services	Fix problem with 'empty' function and some PHP versions	2015-04-11 17:23:37 +02:00
Choice.php	Add licence informations on classes	2014-12-17 13:48:03 +01:00
Editable.php	Changed the file header to framadate license	2015-04-06 12:54:18 +02:00
Form.php	Changed defaut edition option	2015-04-06 14:06:47 +02:00
FramaDB.php	Fixes after merge	2015-04-07 23:17:26 +02:00
Message.php	New edition possibility is taken into account	2015-04-05 17:44:29 +02:00
Utils.php	Merge remote-tracking branch 'upstream/develop' into develop	2015-04-13 16:16:02 +02:00