Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

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

Snippets Groups Projects

c148fbe3

Commit c148fbe3 authored 8 years ago by David Rothstein

Downloads
- Plain Diff

Merge tag '7.52' into 7.x

7.52 release

Conflicts:
	CHANGELOG.txt
	includes/bootstrap.inc

parents 5533335a cabbffd1

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.txt 6 additions, 2 deletions

CHANGELOG.txt
includes/bootstrap.inc 1 addition, 1 deletion

includes/bootstrap.inc
includes/database/select.inc 15 additions, 0 deletions

includes/database/select.inc
modules/simpletest/tests/taxonomy_test.module 30 additions, 0 deletions

modules/simpletest/tests/taxonomy_test.module
modules/system/system.module 1 addition, 1 deletion

modules/system/system.module
modules/taxonomy/taxonomy.module 4 additions, 4 deletions

modules/taxonomy/taxonomy.module
modules/taxonomy/taxonomy.pages.inc 1 addition, 1 deletion

modules/taxonomy/taxonomy.pages.inc
modules/taxonomy/taxonomy.test 110 additions, 0 deletions

modules/taxonomy/taxonomy.test

with 168 additions and 9 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