Merge remote-tracking branch 'remotes/upstream/master' into add_map_sets_koans

Conflicts: lib/runner.ex
2016-05-27 15:47:49 +01:00
parent c95f97e968 6e99c89622
commit 4f81db44a2
6 changed files with 86 additions and 2 deletions
--- a/lib/runner.ex
+++ b/lib/runner.ex
@@ -16,6 +16,7 @@ defmodule Runner do
    Processes,
    Tasks,
    Agents,
+    Protocols,
    MapSets,
  ]