merge MVP back into Master - Githubissues

beckastar / ladynerds_site

Django CRUD for the Ladynerds organization

7 stars 8 forks source link

merge MVP back into Master #55

Closed andreebrazeau closed 8 years ago

andreebrazeau commented 8 years ago

The goal of this merge is to go back to have Master the production branch. After this is merge the MVP branch should be removed.

Motivation and Context

We are working on MVP and master. We should keep master the production branch. Then we can create feature branch from master to add features.

Screenshots (if appropriate):

Types of changes

[x] Bug fix (non-breaking change which fixes an issue)
[ ] New feature (non-breaking change which adds functionality)
[ ] Breaking change (fix or feature that would cause existing functionality to change)
Checklist:

[x] My code follows the code style of this project.
[x] My change requires a change to the documentation.
[x] I have updated the documentation accordingly.