Gitblit devel
parent: 2df02e | patch | commitdiff
David Ostrovsky
2013-04-14 94793ed10acf996a4b3f9f1a8538a1b997436d9f
refs
author David Ostrovsky <david@ostrovsky.org>
Sunday, April 14, 2013 05:39 -0400
committer David Ostrovsky <david@ostrovsky.org>
Sunday, April 14, 2013 05:39 -0400
commit94793ed10acf996a4b3f9f1a8538a1b997436d9f
tree 371df7db0cdadf4645793e6b3cfb72e4053ee061 tree | zip | gz
parent 2df02e9abdcd13dc7081ef64fae4badbdd38044f view | diff
bffa6449bf97a32d3633031f4accc6915d5e0c0d view | diff 
Merge remote-tracking branch 'upstream/master'

Conflicts:
	releases.moxie
4 files modified
13 ■■■■■ changed files
build.xml 9 ●●●●● diff | view | raw | blame | history
releases.moxie 2 ●●●●● diff | view | raw | blame | history
src/main/java/com/gitblit/JsonServlet.java 1 ●●●●● diff | view | raw | blame | history
src/main/java/com/gitblit/utils/JsonUtils.java 1 ●●●●● diff | view | raw | blame | history