1. 21 Oct, 2017 3 commits
  2. 09 Oct, 2017 1 commit
  3. 01 Sep, 2017 7 commits
  4. 16 Aug, 2017 5 commits
    • Tino Goratsch's avatar
      Merge tag 'v4.12.2' into develop · 788f5961
      Tino Goratsch authored
      Tagging version v4.12.2
      
      # Conflicts:
      #	ACP3/Modules/ACP3/Acp/composer.json
      #	ACP3/Modules/ACP3/Articles/composer.json
      #	ACP3/Modules/ACP3/Captcha/composer.json
      #	ACP3/Modules/ACP3/Categories/composer.json
      #	ACP3/Modules/ACP3/Comments/composer.json
      #	ACP3/Modules/ACP3/Contact/composer.json
      #	ACP3/Modules/ACP3/Emoticons/composer.json
      #	ACP3/Modules/ACP3/Errors/composer.json
      #	ACP3/Modules/ACP3/Feeds/composer.json
      #	ACP3/Modules/ACP3/Filemanager/composer.json
      #	ACP3/Modules/ACP3/Files/composer.json
      #	ACP3/Modules/ACP3/Gallery/composer.json
      #	ACP3/Modules/ACP3/Guestbook/composer.json
      #	ACP3/Modules/ACP3/Menus/composer.json
      #	ACP3/Modules/ACP3/News/composer.json
      #	ACP3/Modules/ACP3/Newsletter/composer.json
      #	ACP3/Modules/ACP3/Permissions/composer.json
      #	ACP3/Modules/ACP3/Polls/composer.json
      #	ACP3/Modules/ACP3/Search/composer.json
      #	ACP3/Modules/ACP3/Seo/composer.json
      #	ACP3/Modules/ACP3/System/composer.json
      #	ACP3/Modules/ACP3/Users/composer.json
      #	ACP3/Modules/ACP3/Wysiwygckeditor/composer.json
      #	ACP3/Modules/ACP3/Wysiwygtinymce/composer.json
      #	installation/composer.json
      788f5961
    • Tino Goratsch's avatar
      Merge tag 'v4.12.2' into develop · f6e2bb7f
      Tino Goratsch authored
      Tagging version v4.12.2
      
      # Conflicts:
      #	ACP3/Modules/ACP3/Acp/composer.json
      #	ACP3/Modules/ACP3/Articles/composer.json
      #	ACP3/Modules/ACP3/Captcha/composer.json
      #	ACP3/Modules/ACP3/Categories/composer.json
      #	ACP3/Modules/ACP3/Comments/composer.json
      #	ACP3/Modules/ACP3/Contact/composer.json
      #	ACP3/Modules/ACP3/Emoticons/composer.json
      #	ACP3/Modules/ACP3/Errors/composer.json
      #	ACP3/Modules/ACP3/Feeds/composer.json
      #	ACP3/Modules/ACP3/Filemanager/composer.json
      #	ACP3/Modules/ACP3/Files/composer.json
      #	ACP3/Modules/ACP3/Gallery/composer.json
      #	ACP3/Modules/ACP3/Guestbook/composer.json
      #	ACP3/Modules/ACP3/Menus/composer.json
      #	ACP3/Modules/ACP3/News/composer.json
      #	ACP3/Modules/ACP3/Newsletter/composer.json
      #	ACP3/Modules/ACP3/Permissions/composer.json
      #	ACP3/Modules/ACP3/Polls/composer.json
      #	ACP3/Modules/ACP3/Search/composer.json
      #	ACP3/Modules/ACP3/Seo/composer.json
      #	ACP3/Modules/ACP3/System/composer.json
      #	ACP3/Modules/ACP3/Users/composer.json
      #	ACP3/Modules/ACP3/Wysiwygckeditor/composer.json
      #	ACP3/Modules/ACP3/Wysiwygtinymce/composer.json
      #	installation/composer.json
      f6e2bb7f
    • Tino Goratsch's avatar
      Merge branch 'hotfix/v4.12.2' · be073861
      Tino Goratsch authored
      be073861
    • Tino Goratsch's avatar
      version bump · 0fe15489
      Tino Goratsch authored
      0fe15489
    • Tino Goratsch's avatar
  5. 14 Aug, 2017 4 commits
  6. 04 Jun, 2017 1 commit
  7. 21 May, 2017 1 commit
  8. 08 May, 2017 6 commits
  9. 07 May, 2017 1 commit
  10. 23 Apr, 2017 4 commits
  11. 19 Apr, 2017 1 commit
  12. 17 Apr, 2017 5 commits
  13. 15 Apr, 2017 1 commit