summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBojan Mihelac <bmihelac@mihelac.org>2015-04-22 11:50:42 (GMT)
committerBojan Mihelac <bmihelac@mihelac.org>2015-04-22 11:50:42 (GMT)
commit562cfb6ab66a2cae1349e734c49ad39864ffd07a (patch)
treebf0ede34b017a0785620717653f4710c02bf5947
parentc2b59b43637d726784c69955a46a441f0658ab7d (diff)
downloaddjango-import-export-562cfb6ab66a2cae1349e734c49ad39864ffd07a.zip
django-import-export-562cfb6ab66a2cae1349e734c49ad39864ffd07a.tar.gz
django-import-export-562cfb6ab66a2cae1349e734c49ad39864ffd07a.tar.bz2
Update changelog.rst
-rw-r--r--docs/changelog.rst4
1 files changed, 3 insertions, 1 deletions
diff --git a/docs/changelog.rst b/docs/changelog.rst
index ef5b2ba..3104720 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -6,7 +6,9 @@ Changelog for django-import-export
- Django 1.8 compatibility
-- make filename available in import_data (#237)
+- add attribute inheritance to Resource (#140)
+
+- make the filename and user available to import_data (#237)
- Add to_encoding functionality (#244)