diff options
| author | Sebastian Spaeth <Sebastian@SSpaeth.de> | 2013-12-12 16:24:34 +0100 |
|---|---|---|
| committer | Sebastian Spaeth <Sebastian@SSpaeth.de> | 2013-12-12 16:24:34 +0100 |
| commit | a42dda21f96f5124d97011c318f068b92a4222b0 (patch) | |
| tree | 13edbe92814c93a4b7cd01ff4ff1af779f3706a7 /mediagoblin/processing | |
| parent | 070bc99c1eaecb6b8ca3d5f5a38942491bb1ef37 (diff) | |
| parent | afff1492f89822d6c36fcad8b74953db2375cebf (diff) | |
| download | mediagoblin-a42dda21f96f5124d97011c318f068b92a4222b0.tar.lz mediagoblin-a42dda21f96f5124d97011c318f068b92a4222b0.tar.xz mediagoblin-a42dda21f96f5124d97011c318f068b92a4222b0.zip | |
Merge branch 'master' into upstream-master
Conflicts:
mediagoblin/templates/mediagoblin/base.html
mediagoblin/templates/mediagoblin/user_pages/user.html
Diffstat (limited to 'mediagoblin/processing')
| -rw-r--r-- | mediagoblin/processing/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mediagoblin/processing/__init__.py b/mediagoblin/processing/__init__.py index b06e4eb9..102fd5de 100644 --- a/mediagoblin/processing/__init__.py +++ b/mediagoblin/processing/__init__.py @@ -399,7 +399,7 @@ class BaseProcessingFail(Exception): subclass from. You shouldn't call this itself; instead you should subclass it - and provid the exception_path and general_message applicable to + and provide the exception_path and general_message applicable to this error. """ general_message = u'' |