Skip to content
This repository was archived by the owner on Aug 12, 2020. It is now read-only.

remove differences #34

Merged
merged 9 commits into from
Aug 23, 2013
Merged

remove differences #34

merged 9 commits into from
Aug 23, 2013

Conversation

ET-CS
Copy link
Collaborator

@ET-CS ET-CS commented Aug 23, 2013

  1. remove def get_context_data(self, **kwargs): and div class="fileupload-content"
  2. +from django.conf.urls import patterns, include, url in urls.py
  3. fix '-' before bootstrap.min.css
  4. minor fix indent in urls.py

sigurdga added a commit that referenced this pull request Aug 23, 2013
@sigurdga
Merge pull request #34 from ET-CS/master
7fdb89c 
Great work again!

I think you should be able to set my repo as a remote and push to that. But it is also good to have a little code review before a merge :)
@sigurdga sigurdga merged commit 7fdb89c into sigurdga:master Aug 23, 2013
@sigurdga
Copy link
Owner

One thing I don't understand is why there needs to be a minus in front of the bootstrap css header line. There is probably a reason for it.

@ET-CS
Copy link
Collaborator Author

ET-CS commented Aug 23, 2013

sorry. typo. fixed. starting to work on update from 8.5.0 to 8.8.2. :)

@sigurdga
Copy link
Owner

Thanks! Good luck!

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ET-CS @sigurdga