446_ontology_ref_by_settings
446_ontology_ref_settings
additional_coverage_OMS
OMS_coverage_2
ref. wadt via variable
Merge branch 'staging' into 446_generalize_ontohub

Conflicts:
	app/models/ontology/import.rb
	app/views/files/_show_file.html.haml
	app/views/repository_settings/_modal.html.haml
superflous commit
generalization via var passing
houndci_change
generalize_unused_trans
Revert commit "generalize_unused_trans"

This reverts commit 879f0f524ca1962344426d5cbafa4aaeda4657c8.
Revert the commit "houndci_change"

This reverts commit f27ff94caec2c7924e462b1a4c90c39892c0e9fa.
Revert commit "generalization via var passing"

This reverts commit 29c3bc5a9acc99ff62b59c82d75c57ab0417de8e.
Revert commit "Merge branch '446_generalize_ontohub' of github.com:ontohub/ontohub into 446_generalize_ontohub"

This reverts commit ccc4afd9c1d3d5ad1d4df424e3e4d40c80e49e63, reversing
changes made to 71013b4ddd4a6ee133b239eb861f06bdd1a0578d.
after revert-same changes-generalization via variable passing
Merge branch 'staging' into 446_generalize_ontohub

Conflicts:

resolving conflicts in app/views/history/show.html.haml lib/tasks/generate.rake
Merge branch '446_generalize_ontohub' into staging
This is final merge of pull request.