inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

ACE-4613: Merged 5.1.N (5.1.1) to HEAD (5.1)

Browse Source 
118172 rneamtu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1) (PARTIAL MERGE)
      118083 rneamtu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.4)
         117710 amorarasu: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.6)
            117626 rneamtu: Merged NESS/4.1.N-2015-11-13 (4.1.11) to V4.1-BUG-FIX (4.1.11)
               117543: MNT-15230 : Update Copyright year to 2016
                  - Updated year; renamed splash_2016.png
         117912 rneamtu: MNT-15230 : Update Copyright year to 2016
            - Modified extra properties files for V4.2.N


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@120304 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-12-17 10:44:50 +00:00
parent 8a930d5fa6
commit 3f01226087
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/java/org/alfresco/web/ui/repo/tag/PageTag.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2005-2015 Alfresco Software Limited. * Copyright (C) 2005-2016 Alfresco Software Limited.
* *
* This file is part of Alfresco * This file is part of Alfresco
* *
@@ -100,7 +100,7 @@ public class PageTag extends TagSupport
"<a class='footer' href='http://www.alfresco.com'>Alfresco</a> or its " + "<a class='footer' href='http://www.alfresco.com'>Alfresco</a> or its " +
"<a class='footer' href='http://www.alfresco.com/partners/'>Certified Partners</a>. " + "<a class='footer' href='http://www.alfresco.com/partners/'>Certified Partners</a>. " +
"<a class='footer' href='http://www.alfresco.com/services/support/'>Click here for support</a>. " + "<a class='footer' href='http://www.alfresco.com/services/support/'>Click here for support</a>. " +
"Alfresco Software Inc. &copy; 2005-2015 All rights reserved."; "Alfresco Software Inc. &copy; 2005-2016 All rights reserved.";
private final static Log logger = LogFactory.getLog(PageTag.class); private final static Log logger = LogFactory.getLog(PageTag.class);
private static String alfresco = null; private static String alfresco = null;

2
source/web/index.jsp
View File

@@ -115,7 +115,7 @@ ModuleDetails shareServicesModule = moduleService.getModule("alfresco-share-serv
<div class="push"></div> <div class="push"></div>
</div> </div>
<div class="footer"> <div class="footer">
Alfresco Software, Inc. &copy; 2005-2015 All rights reserved. Alfresco Software, Inc. &copy; 2005-2016 All rights reserved.
</div> </div>
</body> </body>
</html> </html>