修改Movie中API轉移引起的問題
Merge remote-tracking branch 'origin/milestone' into milestone
修改Movie中API轉移引起的問題
豆瓣新版電影接口就是1tuo no。。文檔各種不對應還貼出來。。
修改maven配置文件
Merge branch 'master' into milestone

Conflicts:
	douban-scala.iml
	pom.xml
	src/main/scala/com/douban/models/Movie.scala
Merge remote-tracking branch 'origin/milestone' into milestone

Conflicts:
	src/main/scala/com/douban/common/Auth.scala
	src/main/scala/com/douban/models/Movie.scala
添加sbt支持
Merge remote-tracking branch 'origin/master'