From 4173974a6af0dd68f0aef006e5062f131c879dd7 Mon Sep 17 00:00:00 2001 From: Jonatha Cardoso Date: Mon, 13 Sep 2021 14:16:13 -0300 Subject: [PATCH] Release: 3.0.4 --- saap/settings.py | 2 +- saap/templates/base.html | 2 +- sync.sh | 7 +++++++ 3 files changed, 9 insertions(+), 2 deletions(-) create mode 100755 sync.sh diff --git a/saap/settings.py b/saap/settings.py index 2828071..f4a6ffc 100644 --- a/saap/settings.py +++ b/saap/settings.py @@ -57,7 +57,7 @@ DADOS_SITE = config('DADOS_SITE'); BRASAO_PROPRIO = config('BRASAO_PROPRIO'); -VERSION='3.0.3' +VERSION='3.0.4' INSTALLED_APPS = ( #'django_admin_bootstrapped', diff --git a/saap/templates/base.html b/saap/templates/base.html index e363012..4692da2 100644 --- a/saap/templates/base.html +++ b/saap/templates/base.html @@ -230,7 +230,7 @@

Desenvolvido pelo Interlegis em software livre e aberto. - Release: 3.0.3 + Release: 3.0.4

diff --git a/sync.sh b/sync.sh new file mode 100755 index 0000000..e5f3ca4 --- /dev/null +++ b/sync.sh @@ -0,0 +1,7 @@ +#/bin/bash + +git fetch upstream +git checkout master +git merge upstream/master +git push origin master +git push --tags