##// END OF EJS Templates
Merged r4618 and r4619 from trunk....
Jean-Philippe Lang -
r4500:151a49b319fa
parent child
Show More
@@ -69,7 +69,7
69
69
70 <div id="footer">
70 <div id="footer">
71 <div class="bgl"><div class="bgr">
71 <div class="bgl"><div class="bgr">
72 Powered by <%= link_to Redmine::Info.app_name, Redmine::Info.url %> &copy; 2006-2010 Jean-Philippe Lang
72 Powered by <%= link_to Redmine::Info.app_name, Redmine::Info.url %> &copy; 2006-2011 Jean-Philippe Lang
73 </div></div>
73 </div></div>
74 </div>
74 </div>
75 </div>
75 </div>
@@ -3,8 +3,8 require 'rexml/document'
3 module Redmine
3 module Redmine
4 module VERSION #:nodoc:
4 module VERSION #:nodoc:
5 MAJOR = 1
5 MAJOR = 1
6 MINOR = 0
6 MINOR = 1
7 TINY = 5
7 TINY = 0
8
8
9 # Branch values:
9 # Branch values:
10 # * official release: nil
10 # * official release: nil
General Comments 0
You need to be logged in to leave comments. Login now