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

Merge branch 'master' into feature-tasklist

Browse Source 
Conflicts:
	src/main/scala/app/IssuesController.scala
	src/main/twirl/issues/create.scala.html
This commit is contained in:
bati11
2014-09-19 12:45:09 +09:00
parent b55fc649a6 5bddd352af
commit 937814ec5d
377 changed files with 101076 additions and 63111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/twirl/helper/preview.scala.html
View File

@@ -25,8 +25,8 @@
</div>
</div>
</div>
<link href="@assets/google-code-prettify/prettify.css" type="text/css" rel="stylesheet"/>
<script src="@assets/google-code-prettify/prettify.js"></script>
<link href="@assets/vendors/google-code-prettify/prettify.css" type="text/css" rel="stylesheet"/>
<script src="@assets/vendors/google-code-prettify/prettify.js"></script>
<script>
$(function(){
@if(elastic){