Skip to content
Snippets Groups Projects
Commit 8f2863c8 authored by felix kleinert's avatar felix kleinert
Browse files

Merge branch 'develop' into 'felix_issue062_apply_advanced_pooling_in_inception_block_feat' 

# Conflicts:
#   test/test_model_modules/test_inception_model.py
parents 573b3e19 12634b5f