Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-02 11:36:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into asciidoctorj

Browse Source 
Conflicts:
	src/main/scala/app/RepositoryViewerController.scala
This commit is contained in:
Tobias Roeser
2014-03-29 13:53:23 +01:00
parent 10a40bfcaf 5317ac5e03
commit c9a1515d1f
73 changed files with 1694 additions and 599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
project/build.scala
View File

@@ -31,12 +31,13 @@ object MyBuild extends Build {
"org.scalatra" %% "scalatra-specs2" % ScalatraVersion % "test",
"org.scalatra" %% "scalatra-json" % ScalatraVersion,
"org.json4s" %% "json4s-jackson" % "3.2.5",
"jp.sf.amateras" %% "scalatra-forms" % "0.0.11",
"jp.sf.amateras" %% "scalatra-forms" % "0.0.14",
"commons-io" % "commons-io" % "2.4",
"org.pegdown" % "pegdown" % "1.4.1",
"org.apache.commons" % "commons-compress" % "1.5",
"org.apache.commons" % "commons-email" % "1.3.1",
"org.apache.httpcomponents" % "httpclient" % "4.3",
"org.apache.sshd" % "apache-sshd" % "0.10.0",
"com.typesafe.slick" %% "slick" % "1.0.1",
"com.novell.ldap" % "jldap" % "2009-10-07",
"com.h2database" % "h2" % "1.3.173",