Merge remote-tracking branch 'gabime/master'

f17eb1bb · Puasonych · be685337 · 5e08950e · f17eb1bb · f17eb1bb
Commit f17eb1bb authored Apr 16, 2018 by Puasonych
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

README.md include/spdlog/contrib/README.md +1 -0

.gitignore include/spdlog/contrib/sinks/.gitignore +1 -0

No files found.
--- a/include/spdlog/contrib/README.md
+++ b/include/spdlog/contrib/README.md
+Please put here your contribs. Popular contribs will be moved to main tree after stablization
--- a/include/spdlog/contrib/sinks/.gitignore
+++ b/include/spdlog/contrib/sinks/.gitignore
+