Permalink
Browse files

Merge branch 'master' of github.com:mariusdanciu/shift

  • Loading branch information...
2 parents 6817730 + 1667563 commit 472acd74faab486ffbc23661b950a0cd847a717e @mariusdanciu committed Nov 20, 2011
Showing with 1 addition and 1 deletion.
  1. +1 −1 README
View
2 README
@@ -1,2 +1,2 @@
-Shift is a pure stateless web framework written in Scala being strongly inspired by LiftWeb.
+Shift is a pure stateless and asynchronous web framework written in Scalah being inspired by LiftWeb and Scalaz HTTP.

0 comments on commit 472acd7

Please sign in to comment.