Download as
Browse Code »

Commit 85c1bb23f4d2f698c27731ae49ff0e1cd2e569a5

Authored by Marco
1 parent 20791e1d
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Fixing merge conflicts

Showing 1 changed file with 1 additions and 0 deletions   Show diff stats
src/colab/custom_settings.py
  Diff comments   View file @85c1bb2
@@ -209,6 +209,7 @@ TEMPLATE_CONTEXT_PROCESSORS = ( @@ -209,6 +209,7 @@ TEMPLATE_CONTEXT_PROCESSORS = (
209 'django.core.context_processors.tz', 209 'django.core.context_processors.tz',
210 'django.contrib.messages.context_processors.messages', 210 'django.contrib.messages.context_processors.messages',
211 'django.core.context_processors.request', 211 'django.core.context_processors.request',
  212 + 'django_browserid.context_processors.browserid',
212 'django_mobile.context_processors.is_mobile', 213 'django_mobile.context_processors.is_mobile',
213 'super_archives.context_processors.mailarchive', 214 'super_archives.context_processors.mailarchive',
214 'home.context_processors.robots', 215 'home.context_processors.robots',