Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

drupal
- Activity
- Members
- Labels
- Wiki
- Custom issue tracker
- Model registry

Snippets Groups Projects

02ee6ae5

Commit 02ee6ae5 authored 12 years ago by Daniel Wehner Committed by Tim Plunkett 12 years ago

Downloads
- Patches
- Plain Diff

fix some merge conflicts

parent 1d248ad7

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

lib/Drupal/views/Plugins/Type/DisplayPluginManager.php 1 addition, 1 deletion

lib/Drupal/views/Plugins/Type/DisplayPluginManager.php
lib/Drupal/views/Plugins/Type/ExposedFormPluginManager.php 1 addition, 1 deletion

lib/Drupal/views/Plugins/Type/ExposedFormPluginManager.php
lib/Drupal/views/Plugins/Type/HandlerPluginManager.php 15 additions, 4 deletions

lib/Drupal/views/Plugins/Type/HandlerPluginManager.php
lib/Drupal/views/Plugins/Type/LocalizationPluginManager.php 1 addition, 1 deletion

lib/Drupal/views/Plugins/Type/LocalizationPluginManager.php

with 18 additions and 7 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment