https://src.bluestatic.org / armadillo.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7e83d49 4e176f3)
Merge branch 'backend-tv-rename'
authorRobert Sesek <rsesek@bluestatic.org>
Sat, 16 Apr 2011 22:12:31 +0000 (18:12 -0400)
committerRobert Sesek <rsesek@bluestatic.org>
Sat, 16 Apr 2011 22:12:31 +0000 (18:12 -0400)

Trivial merge
A web-based file manager that allows you to manage a file system from your browser.