view files/.svn/text-base/delete.me.svn-base @ 431:d3af621ba9d4 bug_168

Update the master branch via git pull master rather than git fetch (which doesn't merge any particular branch)
author Chris Cannam
date Sun, 05 Jun 2011 10:28:27 +0100
parents 513646585e45
children
line wrap: on
line source
default directory for uploaded files