Merge remote-tracking branch 'origin/2.3-gae' into 2.3
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/34a1da66 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/34a1da66 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/34a1da66 Branch: refs/heads/2.3 Commit: 34a1da6677ab574071c03bf9a9af3c52d2386cdf Parents: 0d434f4 c1f7364 Author: ddekany <[email protected]> Authored: Thu Sep 3 01:21:21 2015 +0200 Committer: ddekany <[email protected]> Committed: Thu Sep 3 01:21:56 2015 +0200 ---------------------------------------------------------------------- build.xml | 9 +++++---- src/dist/DISCLAIMER | 8 ++++++++ 2 files changed, 13 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/34a1da66/build.xml ---------------------------------------------------------------------- diff --cc build.xml index 5026ef6,03ac2fb..d172f10 --- a/build.xml +++ b/build.xml @@@ -729,9 -730,10 +729,10 @@@ </license> </licenses> <scm> - <connection>scm:git:[email protected]:freemarker/freemarker.git</connection> - <developerConnection>scm:git:[email protected]:freemarker/freemarker.git</developerConnection> - <url>[email protected]:freemarker/freemarker.git</url> + <connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-freemarker.git</connection> + <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/maven.git</developerConnection> + <!-- <url>https://github.com/apache/freemarker/tree/${project.scm.tag}</url> --> - <tag>2.3-gae</tag> ++ <tag>2.3</tag> </scm> <developers> <developer>
