Skip to content
Snippets Groups Projects
Commit 336322c4 authored by Till Brehm's avatar Till Brehm
Browse files

Merge branch 'stable-3.1' into 'stable-3.1' 

# Conflicts:
#   install/sql/incremental/upd_dev_collection.sql
parents e6c50f0a ff5fe5db
No related branches found
No related tags found
1 merge request!1052change cc and sender_cc column type
Hide whitespace changes
Inline Side-by-side
Showing
with 79 additions and 14 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment