Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync 2 #12

Merged
merged 24 commits into from May 7, 2017
Merged

Sync 2 #12

merged 24 commits into from May 7, 2017

Conversation

nemsia
Copy link
Owner

@nemsia nemsia commented May 7, 2017

No description provided.

nemsia and others added 24 commits April 30, 2017 14:04
Restore pg dump with mastodon user.
Change version on manifest
[enh] Switch to tagged release
[fix] Restore pg dump and make jenkins happy
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] Upgrade from 1.3.3
[fix] Jenkins upgrade error
[fix] Reinstall dependencies on restore + check .fonctions on remove
@nemsia nemsia merged commit e55bcb4 into nemsia:master May 7, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants