diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2011-03-12 18:23:31 +0100 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2011-03-12 18:23:31 +0100 |
| commit | 388171b482b4790f9f0787271f60e9706330bc7b (patch) | |
| tree | 7f202b121dc5ca6e244b1fd2f0cfe7ac057bd100 /git-tools/merge.php | |
| parent | bc42cbd94bddbdea2714978c11327b4897d6fd0f (diff) | |
| parent | 7a39bdef890a4c781eda8ad03a6e3821a9f339df (diff) | |
| download | forums-388171b482b4790f9f0787271f60e9706330bc7b.tar forums-388171b482b4790f9f0787271f60e9706330bc7b.tar.gz forums-388171b482b4790f9f0787271f60e9706330bc7b.tar.bz2 forums-388171b482b4790f9f0787271f60e9706330bc7b.tar.xz forums-388171b482b4790f9f0787271f60e9706330bc7b.zip | |
Merge branch 'ticket/bantu/10088' into develop-olympus
* ticket/bantu/10088:
[ticket/10088] Also ignore DBMS versions other than MySQLi in cache mock.
Diffstat (limited to 'git-tools/merge.php')
0 files changed, 0 insertions, 0 deletions