906aebceed
Resolved all the conflicts since 2.3.0 -> HEAD. Following is a list of commits that could not be applied cleanly or are obviated with the abstract_controller refactor. They all need to be revisited to ensure that fixes made in 2.3 do not reappear in 3.0: |
||
---|---|---|
.. | ||
ci_build.rb | ||
ci_setup_notes.txt | ||
cruise_config.rb | ||
geminstaller.yml | ||
site.css | ||
site_config.rb |