diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:33:44 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:33:44 -0400 |
| commit | 634baedd76412bd40499f413df934bb47a16e892 (patch) | |
| tree | 8918d28c7ab4342f0738985e37af1dfc42d0e93a | |
| parent | 6dc1997577fab2c366781fd7048144935afa0012 (diff) | |
| parent | c96958a50a97382ef4ada897d1e7120d7a222a28 (diff) | |
Merge branch 'archwiki'
# Conflicts:
# skins/ArchLinux/archlogo.png
# skins/ArchLinux/favicon.ico
0 files changed, 0 insertions, 0 deletions