Héctor Hurtado 9a52a7192a Resolve conflicts

2019-12-16 10:42:30 +01:00

..

interfaces.rst

doc: style fixes and links

2019-12-13 15:08:02 +01:00

philosophy.rst

doc: markup :any: role as default role, which is now :tech: (custom)

2019-12-11 15:59:27 +01:00

request_life_cycle.rst

doc: add link

2019-12-13 15:43:51 +01:00

resource_tree.rst

Resolve conflicts

2019-12-16 10:42:30 +01:00

route_matching.rst

doc: drop stale todo block

2019-12-13 15:36:41 +01:00

routes.rst

doc: drop already resolved todo block

2019-12-13 16:09:52 +01:00