diff options
| author | Lukas Fleischer <archlinux@cryptocrack.de> | 2012-03-09 09:27:49 +0100 |
|---|---|---|
| committer | Lukas Fleischer <archlinux@cryptocrack.de> | 2012-03-09 09:27:49 +0100 |
| commit | 1e29bd2217f4320d3df156c448bf16aaeaec53d6 (patch) | |
| tree | 97fcadd8516f137d598ed30c392b9922176ab2ab /.gitignore | |
| parent | f5e1652bf95ed7b63a27042d8bb8b1195d7c9158 (diff) | |
| parent | bfb25807c49d3f35cdce91947a442455e1940392 (diff) | |
| download | aurweb-1e29bd2217f4320d3df156c448bf16aaeaec53d6.tar.xz | |
Merge branch 'maint'
Conflicts:
UPGRADING
web/lib/config.inc.php.proto
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions