diff options
| author | Benny Baumann <BenBE@geshi.org> | 2014-11-23 15:21:16 +0100 |
|---|---|---|
| committer | Benny Baumann <BenBE@geshi.org> | 2014-11-23 15:21:16 +0100 |
| commit | 1cc5257aba1e6ae883caf464eaadf25783d2279d (patch) | |
| tree | c9274d32c2cdee6af9b7fafab759c3862f3f693f /.gitignore | |
| parent | 0bae20ba9f726c964eaee62a3b41c2da65bb8f0b (diff) | |
| parent | 0950de5691c8f3e6b3115413e54d4932a2c923c7 (diff) | |
| download | cacert-devel-1cc5257aba1e6ae883caf464eaadf25783d2279d.tar.gz cacert-devel-1cc5257aba1e6ae883caf464eaadf25783d2279d.tar.xz cacert-devel-1cc5257aba1e6ae883caf464eaadf25783d2279d.zip | |
Merge branch 'bug-28' into release
Conflicts:
includes/account.php
scripts/cron/warning.php
www/disputes.php
www/wot.php
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions