From 3d3913686526f4495cca6c0234ea06faf46b1bfe Mon Sep 17 00:00:00 2001
From: nemsia <nemsia@nemsia.org>
Date: Sun, 7 May 2017 23:22:41 +0200
Subject: Sync (#11)

* [enh] Switch to tagged release

* [enh] Switch to tagged release on upgrade

* [fix] Restore pg dump

Restore pg dump with mastodon user.

* Change version on manifest

* [fix] Change rm dump to ynh_secure_remove

* [fix] Upgrade from 1.3.3

Fix error: Your local changes to the following files would be overwritten by merge:
        .babelrc
        .dockerignore
        .editorconfig
        .env.production.sample
        .gitignore
        .rubocop.yml
        .travis.yml
        Capfile
        Dockerfile
        README.md
        Vagrantfile
        ....

* [fix] Owner of live

* [fix] Reinstall dependencies on restore

* Return to home

* [fix] Jenkins upgrade error

* Check .fonctions

* Remove unneeded comment

* Add apt lists to backup

* Change .list name on backup

* Copy Apt .lists on restore

* version 1.3.3 on manifest

* Remove admin instructions + TODO
---
 manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'manifest.json')

diff --git a/manifest.json b/manifest.json
index 8b93539..fa2886b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -9,7 +9,7 @@
 		"en": "Mastodon is a free, open-source social network.",
 		"fr": "Mastodon est un réseau social gratuit et open source."
 	},
-	"version": "1.1.1",
+	"version": "1.3.3",
 	"url": "https://github.com/tootsuite/mastodon",
 	"license": "AGPL v3.0",
 	"maintainer": {
-- 
cgit v1.2.3-70-g09d2