Fixing merge conflicts (6767a343) · Commits · Issue forks / private_message-3099166 · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

P

private_message-3099166
- Activity
- Members
- Labels
- Custom issue tracker
- Model registry

Snippets Groups Projects

6767a343

Commit 6767a343 authored 6 years ago by Jay Friendly

Downloads
- Plain Diff

Fixing merge conflicts

parents 8ac26c0e 3573065c

No related branches found

Tags 1.0.2

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

js/private_message_thread.js 10 additions, 15 deletions

js/private_message_thread.js
private_message.module 104 additions, 0 deletions

private_message.module
src/Plugin/Field/FieldFormatter/PrivateMessageThreadMessageFormatter.php 7 additions, 3 deletions

...d/FieldFormatter/PrivateMessageThreadMessageFormatter.php

with 121 additions and 18 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