Commit c7306389 authored May 08, 2015 by Raniere Silva

Merge branch 'core' into gh-pages

parents 48d7a0aa 4f917397

.mailmap

0 → 100644

+5 −0

Original line number	Diff line number	Diff line
		Andy Boughton <abought@gmail.com> <pchemist@gmail.com>
		Greg Wilson <gvwilson@software-carpentry.org> <gvwilson@third-bit.com>
		Abigail Cabunoc <abigail.cabunoc@oicr.on.ca> <abigail.cabunoc@gmail.com>
		Francois Michonneau <francois.michonneau@gmail.com> <francois.michonneau@gmail.Com>
		Raniere Silva <raniere@ime.unicamp.br> <ra092767@ime.unicamp.br>

.update-copyright.conf

0 → 100644

+6 −0

Original line number	Diff line number	Diff line
		[project]
		vcs: Git

		[files]
		authors: yes
		files: no

AUTHORS

0 → 100644

+17 −0

Original line number	Diff line number	Diff line
		lesson-template was written by:
		Aaron O'Leary <aaron.oleary@gmail.com>
		Abigail Cabunoc <abigail.cabunoc@oicr.on.ca>
		Andy Boughton <abought@gmail.com>
		Bill Mills <mills.wj@gmail.com>
		Francois Michonneau <francois.michonneau@gmail.com>
		Greg Wilson <gvwilson@software-carpentry.org>
		James Allen <jamesallen0108@gmail.com>
		John Blischak <jdblischak@gmail.com>
		Jon Pipitone <jon.pipitone@utoronto.ca>
		Michael Hansen <hansen.mike@gmail.com>
		Piotr Banaszkiewicz <piotr@banaszkiewicz.org>
		Raniere Silva <raniere@ime.unicamp.br>
		Rémi Emonet <remi.emonet@reverse--com.heeere>
		Timothée Poisot <tim@poisotlab.io>
		Trevor Bekolay <tbekolay@gmail.com>
		W. Trevor King <wking@tremily.us>

requirements.txt

+1 −0

Original line number	Diff line number	Diff line
		CommonMark
		pandocfilters
		PyYAML
		update-copyright