Merge branch 'multiple_primary_keys'
Merge branch 'multiple_primary_keys'
Merge branch 'multiple_primary_keys'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Inherited PKs for weak objects in sqla

flask_admin.contrib.sqla.tools.is_inherited_primary_key() now works even if the inherited primary key is itself a foreign key. This leads to a better support of SQLAlchemies *joined table inheritance*
Merge pull request #298 from sumpfgottheit/inherit_pk_weak_entities

Inherit pk weak entities