Michael Snoyman f4a0d6d61e Merge branch 'master' into new-upload ... Conflicts: Application.hs Handler/Haddock.hs Handler/StackageHome.hs Import.hs cabal.config config/routes stackage-server.cabal templates/doc-list.hamlet		2015-03-13 14:44:41 +02:00
..
deploy.yaml	Added deploy.yaml	2014-05-12 12:40:23 +03:00
favicon.ico	Replace favicon with stackage icon	2014-11-13 15:53:18 +01:00
keter.yaml	Drop copy-to www.stackage.org from keter.yaml	2015-03-11 18:34:11 -04:00
models	Merge branch 'master' into new-upload	2015-03-13 14:44:41 +02:00
postgresql.yml-sample	Create -sample config files to avoid credentials in repo	2014-10-24 13:57:40 +03:00
robots.txt	Disallow crawling Haddocks #20	2015-01-05 11:00:11 +02:00
routes	Merge branch 'master' into new-upload	2015-03-13 14:44:41 +02:00
settings.yml-sample	S3 storage example	2014-12-11 22:51:03 +02:00