summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-05-01 15:33:44 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-05-01 15:33:44 -0400
commit634baedd76412bd40499f413df934bb47a16e892 (patch)
tree8918d28c7ab4342f0738985e37af1dfc42d0e93a
parent6dc1997577fab2c366781fd7048144935afa0012 (diff)
parentc96958a50a97382ef4ada897d1e7120d7a222a28 (diff)
Merge branch 'archwiki'
# Conflicts: # skins/ArchLinux/archlogo.png # skins/ArchLinux/favicon.ico
0 files changed, 0 insertions, 0 deletions