diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2012-04-01 15:36:11 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2012-04-01 15:36:11 -0500 |
| commit | e089b66bde44ec90950a0acc9d471245295ffa4e (patch) | |
| tree | 0c73c429ccbb312c5be22a17f4ee954f9461e75f /docs/source/conf.py | |
| parent | 1e3a0e0ca0c58ae740424fa6cf239f2dba5dc592 (diff) | |
| parent | bc27a100fc05cea72c47d8ae446454d347d0a0ff (diff) | |
| download | mediagoblin-e089b66bde44ec90950a0acc9d471245295ffa4e.tar.lz mediagoblin-e089b66bde44ec90950a0acc9d471245295ffa4e.tar.xz mediagoblin-e089b66bde44ec90950a0acc9d471245295ffa4e.zip | |
Merge remote-tracking branch 'refs/remotes/elrond/sql/final'
Conflicts:
mediagoblin/tests/test_submission.py
Also, WHOO SQL SWITCHOVER PARTY!
ASCII DANCE PARTY
/_o_/ \ / \o_ o
( _|_ ) //)
/\ / o \ /| /|
*BMCH BMCH BMCH BMCH*
%
/_o_/ HHHYAAaaaaa
/_
/ /
%
AAAAAHAHAHAHAHHHAAHA
,, .------
o_o ;; /\\ \ $ __
'\/ || // \\ # /_/
\// // //\\ \
) \\ \ %
\\ \\_____\
| ) //-------
/_/_ // //
SWITCH YOUR DATABASE
FLIP A FUKKEN BOOLEAN
%
__________
.-' '-.
.' '.
.' _--_ _--_ '.
/ / (_). / (_). \
. | | | | .
| ._____, ._____, |
| ____________________ |
| | | |
' \ / '
\ '. .----./ /
\ '._ / / /
'. '--------' .'
'._ _.'
'----------'
Diffstat (limited to 'docs/source/conf.py')
0 files changed, 0 insertions, 0 deletions