Checkout Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates

Merge of "modules/in-bulletin/branches/5.2.x@16384" to "modules/in-bulletin/branches/5.3.x@16368".

Conflicts:

  • units/emoticons/emoticons_config.php
  • units/poll_comments/poll_comments_config.php
  • units/polls/polls_config.php
  • units/posts/post_eh.php
  • units/posts/posts_config.php
  • units/private_messages/private_message_eh.php
  • units/private_messages/private_messages_config.php
  • units/topics/topics_config.php
  • units/topics/topics_event_handler.php
  1. … 6 more files in changeset.

Merge of "modules/in-bulletin/releases/5.2.1-B1@15630" to "modules/in-bulletin/branches/5.3.x@15655".

1. changes to unit configs were merged incorrectly

  1. … 2 more files in changeset.

Merge of "modules/in-bulletin/releases/5.2.1-B1@15630" to "modules/in-bulletin/branches/5.3.x@15655".

  1. … 21 more files in changeset.

Bug #0001399: Remove "ItemSQLs" from unit configs

INP-1156

  1. … 9 more files in changeset.

Releasing version 'branches/5.3.x' (copy from 'branches/5.2.x') of 'modules/in-bulletin' module.

  1. … 94 more files in changeset.