conflict
conflict
ignore /var
fixes for philpapers transition
Merge branch 'master' of ssh://github.com/xPapers/xPapers
missing compileyui in README
crontab example
missing sphinx in crontab
unprefixed legacy classes
[BYE] to contain niceName
mcats bug, toher
Merge branch 'master' of ssh://github.com/xPapers/xPapers
fixed Site test
improved journal name handling
hardcoded path removed
Merge branch 'master' of git@github.com:xPapers/xPapers
removed useless config options
conflict
old_url_names table
Merge branch 'master' of git@github.com:xPapers/xPapers