Skip to content

Merged two lines about the Django subreddit#33

Merged
mattmakai merged 5 commits intomattmakai:gh-pagesfrom
jllorencetti:gh-pages
Jul 29, 2014
Merged

Merged two lines about the Django subreddit#33
mattmakai merged 5 commits intomattmakai:gh-pagesfrom
jllorencetti:gh-pages

Conversation

@jllorencetti
Copy link
Copy Markdown
Contributor

Two lines were talking about the subreddit. Merged for simplicity.

@mattmakai
Copy link
Copy Markdown
Owner

I can't auto merge this pull request. Sorry about that, can you update and resubmit?

@jllorencetti
Copy link
Copy Markdown
Contributor Author

I've made others small commits. Maybe is better to just close this and send multiple individual pull requests?

@mattmakai
Copy link
Copy Markdown
Owner

Cool works for me. I may move cookiecutter into its own section as it doesn't fit as a Django project, it's more of a meta-project and it can be used for more than just Django.

mattmakai added a commit that referenced this pull request Jul 29, 2014
Merged two lines about the Django subreddit
@mattmakai mattmakai merged commit 39f0d49 into mattmakai:gh-pages Jul 29, 2014
@jllorencetti
Copy link
Copy Markdown
Contributor Author

Cool. :)
I think another typo was created while moving the cookiecutter line for the new place, I will fix that.
Thank you.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants