From 3a24a45ade91efb8817c204e3005f4b5f0f22917 Mon Sep 17 00:00:00 2001 From: yuri Date: Tue, 8 Jan 2019 16:38:22 +0200 Subject: [PATCH 1/2] fix readme --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 2a5a78ac14..36dc98a5a5 100644 --- a/README.md +++ b/README.md @@ -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 From 533faad8c21fa7f174597208ce94d098a9c25b00 Mon Sep 17 00:00:00 2001 From: yuri Date: Tue, 8 Jan 2019 16:40:34 +0200 Subject: [PATCH 2/2] footer year --- client/res/templates/site/footer.tpl | 2 +- html/main.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/res/templates/site/footer.tpl b/client/res/templates/site/footer.tpl index e7dc3773d8..b5d4fc73a6 100644 --- a/client/res/templates/site/footer.tpl +++ b/client/res/templates/site/footer.tpl @@ -1 +1 @@ -

© 2018 EspoCRM

+

© 2019 EspoCRM

diff --git a/html/main.html b/html/main.html index a7648a678b..03a3f2e0ce 100644 --- a/html/main.html +++ b/html/main.html @@ -33,7 +33,7 @@