Marien Fressinaud
0b89867800
Merge branch 'dev' into 252-extensions
Conflicts:
app/i18n/en/admin.php
app/i18n/en/feedback.php
app/i18n/en/gen.php
app/i18n/fr/admin.php
app/i18n/fr/feedback.php
app/i18n/fr/gen.php
app/views/index/normal.phtml
2014-12-17 21:41:33 +01:00
..
2014-10-05 19:35:29 +02:00
2014-10-05 19:35:29 +02:00
2014-12-03 18:57:53 -05:00
2014-12-12 14:27:50 +01:00
2014-01-03 13:58:08 +01:00
2014-12-05 10:54:44 +01:00
2014-01-12 16:27:35 +01:00
2014-01-25 01:40:55 +01:00
2014-01-19 20:30:08 +01:00
2013-12-26 01:56:58 +01:00
2014-01-03 22:54:25 +01:00