Merge branch 'github_logo' into development

Browse Source

Conflicts:
	requirements/production.txt

...

This commit is contained in:

Roberto Rosario

2012-06-13 03:59:03 -04:00

parent 22caf75653 f2cf069e19

commit 90c411f554

2 changed files with 2 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

docs/_static/mayan_logo_landscape_black.jpg vendored Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 181 KiB