search

Aberhart-school / abe-site

The website of William Aberhart high school
http://schools.cbe.ab.ca/b829/aberhart/
GNU General Public License v3.0
6 stars 8 forks source link

merging owmygreenmatter/master with thirstyice/learning-commons-integration #143

Closed dominic-demierre closed 9 years ago

dominic-demierre commented 9 years ago

this will bring the latter branch up to speed as well as add all the learning commons-related changes from the former branch

thirstyice commented 9 years ago

Why was this done?

dominic-demierre commented 9 years ago

to bring thirstyice:learning-commons-integration up to speed as well as add all the learning commons-related changes from owmygreenmatter:master

thirstyice commented 9 years ago

thirstyice:learning-commons-integration is a separate branch; it doesn't need to be "brought up to speed." This commit merged changes that are irrelevant, will cause merge conflicts, and won't solve any problems into a branch that didn't need them, without any verification or discussion taking place first.

thirstyice commented 9 years ago

I'm fixing this

thirstyice commented 9 years ago

Changes to be pushed are now in learning-commons-final