| commit | 5e83631469f286abb77c95adf5284923a3a0873a | |
| author | Marc Delisle <marc@infomarc.info> | |
| Sun, 18 Sep 2011 12:26:47 +0000 (18 08:26 -0400) | ||
| committer | Marc Delisle <marc@infomarc.info> | |
| Sun, 18 Sep 2011 12:26:47 +0000 (18 08:26 -0400) | ||
| tree | b909eecc3d8769c4019b8dc3088bbf45455215f5 | treesnapshot (tar.gz zip) |
| parent | 8373e5feec2232e6a17b342eb0bf74930431bfcc | commitdiff |
| parent | 6ac29b4791f8c31dd057d4ed981f26599a2cf4a3 | commitdiff |
Fix merge conflicts
| ChangeLog | diff1 | diff2 | blobhistory |
| js/sql.js | diff1 | diff2 | blobhistory |
| libraries/sql_query_form.lib.php | diff1 | diff2 | blobhistory |