Naoki Takezoe 9cfa8c594b Merge branch 'master' into slick2 ...

Conflicts:
	project/build.scala
	src/main/scala/app/IndexController.scala
	src/main/scala/app/RepositorySettingsController.scala
	src/main/scala/model/Account.scala
	src/main/scala/model/BasicTemplate.scala
	src/main/scala/model/Issue.scala
	src/main/scala/model/IssueComment.scala
	src/main/scala/model/package.scala
	src/main/scala/service/IssuesService.scala
	src/main/scala/service/PullRequestService.scala
	src/main/scala/service/RepositoryService.scala
	src/main/scala/service/WikiService.scala
	src/main/scala/servlet/TransactionFilter.scala
	src/main/scala/util/Notifier.scala

2014-07-06 17:02:49 +09:00

..

build.properties

sbt 0.13

2014-03-19 00:48:57 +09:00

build.scala

Merge branch 'master' into slick2

2014-07-06 17:02:49 +09:00

plugins.sbt

sbt 0.13

2014-03-19 00:48:57 +09:00