summaryrefslogtreecommitdiff
path: root/sitestatic/archnavbar/Makefile
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2014-05-25 19:35:23 -0400
committerLuke Shumaker <LukeShu@sbcglobal.net>2014-05-25 19:35:23 -0400
commit824bd93116c4c0a48d7112ae0bceb46e70851df5 (patch)
tree21285571c08e286891b8e7740c543941798fe778 /sitestatic/archnavbar/Makefile
parent7ccaa7be630e50ce40182d168d41c2f333005443 (diff)
parent1a1fd4a3d6aa7f6b2338f7751f5f97a30a059a04 (diff)
Merge branch 'archweb-generic' into master-nomake
Conflicts: templates/public/download.html
Diffstat (limited to 'sitestatic/archnavbar/Makefile')
0 files changed, 0 insertions, 0 deletions