diff options
| author | Benny Baumann <BenBE@geshi.org> | 2013-06-11 22:33:34 +0200 |
|---|---|---|
| committer | Benny Baumann <BenBE@geshi.org> | 2013-06-11 22:33:34 +0200 |
| commit | 216271b2501cba5ac2724c56588fa62c725d1d69 (patch) | |
| tree | 92ac053ba899c2195f411eff5bd8d01cb869c337 /.gitignore | |
| parent | 0913b852c9e7a335cc2700f6f7d573565218c9dc (diff) | |
| parent | f0318d79dbc69e444fee4c085cdb3ee152318e1c (diff) | |
| download | cacert-devel-216271b2501cba5ac2724c56588fa62c725d1d69.tar.gz cacert-devel-216271b2501cba5ac2724c56588fa62c725d1d69.tar.xz cacert-devel-216271b2501cba5ac2724c56588fa62c725d1d69.zip | |
Merge branch 'bug-1162' into testserver-stable
Conflicts:
www/wot.php
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions