Emmanuel Papin
|
9929233e75
|
Merge branch 'master' into plugin_support_test
Conflicts:
configure.ac
web/lang/fr_fr.php
|
2015-02-25 23:14:25 +01:00 |
Isaac Connor
|
c3f96ad8ca
|
fix path to the zone point gif
|
2015-02-19 11:11:01 -05:00 |
|
Emmanuel Papin
|
d961831355
|
Fix conflict when merging upstream master
|
2014-12-13 19:54:54 +01:00 |
|
Isaac Connor
|
82c01479c6
|
move flat css files into the classic skin.
remove autotools references to the flat skin, add the classic/flat css dirs
remove the flat skin
|
2014-12-01 15:44:01 -05:00 |