Yarik / artbox-basic | GitLab

Merge remote-tracking branch 'origin/master' ...

# Conflicts:
#	backend/views/site/index.php
#	common/config/settings.php
#	common/widgets/Alert.php
#	composer.lock
#	frontend/models/ContactForm.php
#	frontend/models/PasswordResetRequestForm.php
#	frontend/models/ResetPasswordForm.php
#	frontend/models/SignupForm.php
#	frontend/views/site/login.php
#	frontend/views/site/requestPasswordResetToken.php
#	frontend/views/site/resetPassword.php
#	frontend/views/site/signup.php

authored

2017-04-05 16:01:31 +0300

SitemapDynamic.php 31 Bytes

Edit Raw Blame History

<?php
    
    return [

    ];