Merge branch 'master' into 'master'
commit2a548eb309cf6bc8e875597e3f5cd095f3af85da
authorf57fea14 <f57fea14@tfwno.gf>
Fri, 17 Oct 2014 18:28:01 +0000 (17 14:28 -0400)
committerf57fea14 <f57fea14@tfwno.gf>
Fri, 17 Oct 2014 18:28:01 +0000 (17 14:28 -0400)
tree4f8ebf5a16ddba45acdb5359998ac947b170c857
parent12d9799a2e68cdd4c3b50d7a37dad7941316f798
parentbf5483016ce5ee5e9a2bd2848a95a88ee1e3d196
Merge branch 'master' into 'master'

Organised Events in Daily Timeline

Dates are approximate as Gamergate is a worldwide event

The happens have been added in a new file and are based on the most recent Current happenings.

Hopefully this file can eventually replace the current unorganised happennings list.

Please vet as soon as possible

See merge request !10