Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 4.4.0 #72

Merged
merged 201 commits into from
Jun 15, 2017
Merged

Merge 4.4.0 #72

merged 201 commits into from
Jun 15, 2017

Conversation

agoat
Copy link
Owner

@agoat agoat commented Jun 15, 2017

No description provided.

leofeyer and others added 30 commits November 25, 2016 12:56
# Conflicts:
#	CHANGELOG.md
#	composer.json
#	src/Resources/contao/themes/flexible/main.css
# Conflicts:
#	CHANGELOG.md
leofeyer and others added 29 commits June 1, 2017 16:15
# Conflicts:
#	CHANGELOG.md
#	src/ContaoCoreBundle.php
#	src/Resources/config/commands.yml
#	src/Resources/contao/config/constants.php
#	src/Resources/contao/languages/fa/default.xlf
#	src/Resources/contao/languages/ja/exception.xlf
#	src/Resources/contao/languages/ja/tl_content.xlf
#	src/Resources/contao/languages/ru/tl_style_sheet.xlf
#	src/Resources/contao/themes/flexible/basic.css
#	src/Resources/contao/themes/flexible/src/basic.css
@agoat agoat merged commit 2d6bd9c into agoat:master Jun 15, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants