This repository has been archived by the owner on Apr 29, 2022. It is now read-only.
Merge separate assopy and conference package repos into the epcon repo #206
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Conflicts: assopy/admin.py assopy/locale/it/LC_MESSAGES/django.po
un altro bug dovuto al cambio dei codici di lingua
in questo modo è possibile utilizzare "manualmente" il backend legacy al bisogno
merged country migrations
copied from pythonitalia
Resolve merge conflicts: .gitignore requirements.txt
Resolved merge conflicts: .gitignore
malemburg
added a commit
that referenced
this pull request
Nov 17, 2015
Merge separate assopy and conference package repos into the epcon repo
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Remote adds used for this:
git remote add assopy git@github.com:EuroPython/assopy.git
git remote add conference git@github.com:EuroPython/conference.git
The distribution files of the packages were moved to new misc/ directories, since we won't need them.
The requirements.txt file was updated to merged dependencies.