Commit Graph

6 Commits

Author SHA1 Message Date
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
Michael Snoyman
d7a4175fde Upgrade to LTS Haskell 1.0 snapshot 2015-01-02 11:48:53 +02:00
Michael Snoyman
ef9e5cc7ce More WIP 2014-12-26 16:13:08 +02:00
Michael Snoyman
3edb017d50 Upgrade Stackage snapshots 2014-12-23 12:10:33 +02:00
Chris Done
9b4b7c0786 Remove the base restriction from cabal.conf 2014-12-21 20:30:02 +01:00
Michael Snoyman
6732b2827a Changes for nice install page 2014-12-12 12:09:20 +02:00