Skip to content

Commit

Permalink
Merge branch 'master' of github.com:Jannchie/biliob
Browse files Browse the repository at this point in the history
Conflicts:
	LICENSE
	README.md
  • Loading branch information
Jannchie committed Nov 14, 2019
2 parents 97fe502 + 2fef89f commit 2841867
Show file tree
Hide file tree
Showing 8 changed files with 5,120 additions and 4 deletions.
9 changes: 9 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
[submodule "biliob-frontend"]
path = biliob-frontend
url = [email protected]:Jannchie/biliob-frontend.git
[submodule "biliob_backend"]
path = biliob_backend
url = [email protected]:Jannchie/biliob_backend.git
[submodule "biliob-spider"]
path = biliob-spider
url = [email protected]:Jannchie/biliob-spider.git
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2018 Jannchie
Copyright (c) 2019 Jannchie

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
# biliob-spider
bilibili data acquisition and analysis.
# BiliOB

BiliOB观测者是一个观测B站UP主及视频数据变化,并予以分析的Web应用程序。
1 change: 1 addition & 0 deletions biliob-frontend
Submodule biliob-frontend added at 09b993
1 change: 1 addition & 0 deletions biliob-spider
Submodule biliob-spider added at 3f9c4b
Loading

0 comments on commit 2841867

Please sign in to comment.