aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Kempson <git@chriskempson.com>2016-06-28 12:37:10 +0100
committerChris Kempson <git@chriskempson.com>2016-06-28 12:37:10 +0100
commit445e9b357473fe33f1413959407207897a90f7b0 (patch)
treefe89027a14722bed26b4a9f43f8da8346970d48c
parent33f87793bb29b81fb1bc19dcb48cb3eaa3778834 (diff)
parent7469dfb234d1a63f567f53e22cd32d7f018fe325 (diff)
Merge remote-tracking branch 'refs/remotes/origin/master' into pr/2
# Conflicts: # list.yaml
-rw-r--r--list.yaml3
1 files changed, 2 insertions, 1 deletions
diff --git a/list.yaml b/list.yaml
index b71d537..af11806 100644
--- a/list.yaml
+++ b/list.yaml
@@ -1,6 +1,7 @@
default: https://github.com/chriskempson/base16-default-schemes
tomorrow: https://github.com/chriskempson/base16-tomorrow-scheme
+atelier: https://github.com/atelierbram/base16-atelier-schemes
+materia: https://github.com/Defman21/base16-materia
# If your scheme is in this repository, please give it a new home!
unclaimed: https://github.com/chriskempson/base16-unclaimed-schemes
-materia: https://github.com/Defman21/base16-materia