summaryrefslogtreecommitdiff
path: root/.gitmodules
diff options
context:
space:
mode:
authorAppleman1234 <applemansigloo@gmail.com>2016-12-15 18:25:42 +0900
committerGitHub <noreply@github.com>2016-12-15 18:25:42 +0900
commitcae526e65a20f3da2d8884c4d8e8978c54120000 (patch)
tree2954153dd49f616f5018490058ff4bfbd17300d3 /.gitmodules
parentb58fab98147a92c8e6d22f15d23684508b6bb811 (diff)
parent5feae402cb55d49963bfd2c6f5a33d10690ecbc1 (diff)
Merge pull request #79 from lainchan/clean_prod_vichan_update
Merge vichan changes from upstream and changes directly applied to the site.
Diffstat (limited to '.gitmodules')
-rw-r--r--.gitmodules6
1 files changed, 6 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
index 73f90e0a..df07fdf3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,9 @@
[submodule "js/wPaint"]
path = js/wPaint
url = https://github.com/vichan-devel/wPaint.git
+ branch = master
+
+[submodule "inc/lib/parsedown"]
+ path = inc/lib/parsedown
+ url = https://github.com/vichan-devel/parsedown
+ branch = master