ninadsp a458147969 Merge from upstream. Resolved a conflict in js/functions.js

2010-08-05 23:51:14 +05:30

..

codegen.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

csv.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

excel.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

htmlword.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

json.php

JSON exported file extension should be .json

2010-08-03 13:10:31 -04:00

latex.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

mediawiki.php

…

ods.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

odt.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

pdf.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

php_array.php

…

sql.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

texytext.php

…

xls.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

xlsx.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

xml.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

yaml.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30