update merging rules as per last meeting
authorJohn Crispin <blogic@openwrt.org>
Fri, 29 Apr 2016 22:24:27 +0000 (00:24 +0200)
committerJohn Crispin <blogic@openwrt.org>
Fri, 29 Apr 2016 22:24:27 +0000 (00:24 +0200)
commita785c11bf2f5c54da7dc073506105598f2ed1df4
tree2b2675d16148da9db77060700d1946b83e7aec69
parent223fc00a8648028d06579d39e3bb23bffe34f8a9
update merging rules as per last meeting

Signed-off-by: John Crispin <blogic@openwrt.org>
pages/development.txt