Merge branch 'hotfix/5.5.5'

This commit is contained in:
yuri
2019-01-08 16:43:06 +02:00
3 changed files with 5 additions and 5 deletions
+3 -3
View File
@@ -54,9 +54,9 @@ Before we can merge your pull request you need to accept our CLA [here](https://
Branches:
* hotfix/* an upcoming maintenance release; fixes should be pushed to this branch;
* master an upcoming minor or major release; new features should be pushed to this branch;
* stable a last stable release.
* hotfix/* upcoming maintenance release; fixes should be pushed to this branch;
* master develop branch; new features should be pushed to this branch;
* stable last stable release.
### How to make a translation
+1 -1
View File
@@ -1 +1 @@
<p class="credit small">&copy; 2018 <a href="https://www.espocrm.com">EspoCRM</a></p>
<p class="credit small">&copy; 2019 <a href="https://www.espocrm.com">EspoCRM</a></p>
+1 -1
View File
@@ -33,7 +33,7 @@
<body>
<div class="container content"></div>
<footer>
<p class="credit small">&copy; 2018 <a href="https://www.espocrm.com" title="Powered by EspoCRM" alt="Visit official EspoCRM website">EspoCRM</a></p>
<p class="credit small">&copy; 2019 <a href="https://www.espocrm.com" title="Powered by EspoCRM" alt="Visit official EspoCRM website">EspoCRM</a></p>
</footer>
</body>
</html>