Merge branch 'release/4.0' into release/4.1

Browse Source

Conflicts:
	frontend/app/templates/work_packages/tabs/_user_activity.html

pull/2838/merge

Jan Sandbrink 10 years ago

parent 711e327d2d c3be047337

commit 5d52ce0e86

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File

Diff Content Not Available