werelate/wiki — pull request #16 by samwilson (2014-06-18 07:12:48+00:00)
Title: Upstream commits added

This simply takes the MediaWiki codebase as it was at 1.7.1 and merges the current werelate master, keeping all of the latter. Baically, to restore the Git history for the project. My idea is that it should now be possible to step through, version by version, and bring things up to date! (Dunno if I'm completely wrong in that though...)

The version of MW that WR is using: https://github.com/wikimedia/mediawiki-core/releases/tag/1.7.1 which is commit 5f4988e (tagged on 9 Jul 2006, 46960 commits to master since this tag as of earlier today).

This was merged into the current master with `git merge -s ours 5f4988e` and so nothing actually changes with the current master. :) We just get history.