first version known from for #608
known from
Merge branch 'release-lizzie' into feature-known-from-box
design for known from for #608
travis-ci fix
Merge branch 'release-lizzie' of github.com:fairnopoly/fairnopoly into release-lizzie
back to where we were before for the sake of deploying
change back so that multiple articles dont get displayed
statistics dropped again
Merge branch 'release-lizzie' of github.com:fairnopoly/fairnopoly into release-lizzie
fixed test by throwing out bullet till the next release
rerooted css files and deleted unused ones
rake task for sold categories #606
implement known-from box - closes #608
Merge branch 'feature-known-from-box' into develop
fix merge
fix merge 2
Merge branch 'release-lizzie' into develop
grid rework complete
merged