Swen Kooij 8b08e5a467 Merge remote-tracking branch 'beer/model_inheritance_free'
# Conflicts:
#	localized_fields/fields/localized_field.py
#	localized_fields/models.py
#	tests/fake_model.py
2017-04-03 14:49:27 +03:00
..
2016-10-21 12:57:51 +03:00
2017-03-18 18:44:26 +03:00