github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-01-19 17:02:45 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
Simple forum software for building great communities.
698 Commits 87 Branches 52 Tags 191 MiB
PHP 60.9%
TypeScript 25.9%
JavaScript 7.9%
Less 4.4%
Blade 0.8%
Other 0.1%
891f9c4032
Go to file
Franz Liedke 891f9c4032 Merge branch 'master' into psr-7 
Conflicts:
	composer.json
	composer.lock
	src/Api/Actions/TokenAction.php
	src/Core/Formatter/FormatterManager.php
	src/Core/Handlers/Events/EmailConfirmationMailer.php
	src/Forum/Actions/ConfirmEmailAction.php
	src/Forum/Actions/IndexAction.php
	src/Forum/Actions/ResetPasswordAction.php
	src/Forum/Actions/SavePasswordAction.php
	src/Forum/routes.php
2015-06-06 13:59:59 +02:00
framework/core Merge branch 'master' into psr-7 2015-06-06 13:59:59 +02:00