osuosl / dougfir-pelican-theme

Pelican theme based off of the OSU Dougfir Drupal theme
Apache License 2.0
2 stars 2 forks source link

Merge master into develop #85

Closed andrewda closed 4 years ago

andrewda commented 4 years ago

Looks like master and develop have diverged a bit, and thus we're missing some mixed content fixes in the osuosl-pelican repo.

This merges the additional changes from master into develop since its the default branch (if we'd like to switch that around let me know) -- luckily there were no conflicts :smile:

Once this is merged, we should update the dougfir-pelican-theme submodule in osuosl-pelican.