Merge branch 'readd-sub' into 'master'

Readded proposals submodule from new location See merge request monero-project/ccs-front!10

Merge branch 'readd-sub' into 'master'
Readded proposals submodule from new location See merge request monero-project/ccs-front!10
37019334 · Diego Salazar · 9cfeede6 · 07bbb470 · 37019334 · 4459b497
Commit 37019334 authored Jan 27, 2019 by Diego Salazar
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

.gitmodules .gitmodules +3 -0

proposals proposals +1 -0

No files found.
--- a/.gitmodules
+++ b/.gitmodules

+[submodule "proposals"]
+	path = proposals
+	url = https://repo.getmonero.org/monero-project/ccs-proposals.git
--- a/proposals @ 4459b497
+++ b/proposals @ 4459b497
+Subproject commit 4459b497ee672bcc7e0848f2da7eed93152e4e06