github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-01-19 18:12:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
Simple forum software for building great communities.
758 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%
0262f45f57
Go to file
Franz Liedke 0262f45f57 Merge branch 'master' into psr-7 
Conflicts:
	src/Api/Actions/Discussions/IndexAction.php
	src/Api/Actions/SerializeAction.php
	src/Core/Formatter/FormatterManager.php
	src/Extend/ForumAssets.php
	src/Forum/Actions/IndexAction.php
	src/Forum/ForumServiceProvider.php
2015-06-17 00:52:50 +02:00
framework/core Merge branch 'master' into psr-7 2015-06-17 00:52:50 +02:00