Download as
Browse Code »

Commit 63c2135a01ee988a97d690c1bcf0cb389b0cd3e5

Authored by Sergio Oliveira
2 parents 22d38086 ff39d222
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

Merge branch 'django1.6' of github.com:interlegis/colab into django1.6 

Conflicts:
	src/colab/deprecated/templates/account_request_reset_password.html
	src/colab/deprecated/templates/base.html
	src/colab/deprecated/templates/email_account-reset-password.html
	src/colab/deprecated/templates/email_signup-email-confirmation.html
	src/colab/deprecated/templates/home.html
	src/colab/deprecated/templates/login.html
	src/colab/deprecated/templates/user-profile.html
	src/super_archives/templates/message-preview.html
Showing 0 changed files   Show diff stats