diff options
| author | Michael Tänzer <neo@nhng.de> | 2012-04-30 02:38:04 +0200 |
|---|---|---|
| committer | Michael Tänzer <neo@nhng.de> | 2012-04-30 02:38:04 +0200 |
| commit | 3aacc6db438b98a515ce6f4ed42c68e4d06f63ea (patch) | |
| tree | ec55a58524fb6c87dfa528bd8de2531b76ce2bef /locale | |
| parent | aebe99dfea8799e73367d3339d9a30dd7f29fb55 (diff) | |
| parent | 5f13d8f7b344b1d806a423eb1daca56724e78ddd (diff) | |
| download | cacert-devel-3aacc6db438b98a515ce6f4ed42c68e4d06f63ea.tar.gz cacert-devel-3aacc6db438b98a515ce6f4ed42c68e4d06f63ea.tar.xz cacert-devel-3aacc6db438b98a515ce6f4ed42c68e4d06f63ea.zip | |
Merge branch 'tarballs' into release
Conflicts:
locale/escape_special_chars.php
Diffstat (limited to 'locale')
| -rw-r--r--[-rwxr-xr-x] | locale/escape_special_chars.php | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/locale/escape_special_chars.php b/locale/escape_special_chars.php index 32de390..32de390 100755..100644 --- a/locale/escape_special_chars.php +++ b/locale/escape_special_chars.php |