| commit | 88c5f90e5395981f704d162d6c383cc2efb82196 | |
| author | Michal Čihař <michal@cihar.com> | |
| Tue, 18 Oct 2011 10:46:24 +0000 (18 12:46 +0200) | ||
| committer | Michal Čihař <michal@cihar.com> | |
| Tue, 18 Oct 2011 10:46:24 +0000 (18 12:46 +0200) | ||
| tree | cb439e3f61192910e448b266d1a98a1cdf6978b5 | treesnapshot (tar.gz zip) |
| parent | 3535dcfec3274307371f83dba4cc9ea1579b3b78 | commitdiff |
| parent | 8b9e7c1279dc1fb73f3b00acf144e0c4e30de463 | commitdiff |
Merge branch 'QA_3_4'
Conflicts:
libraries/core.lib.php
libraries/sanitizing.lib.php
Conflicts:
libraries/core.lib.php
libraries/sanitizing.lib.php
| ChangeLog | diff1 | diff2 | blobhistory |
| libraries/core.lib.php | diff1 | diff2 | blobhistory |