diff options
| author | kaernyk <kaernyk@gmail.com> | 2014-09-28 04:30:22 -0400 |
|---|---|---|
| committer | kaernyk <kaernyk@gmail.com> | 2014-09-28 04:30:22 -0400 |
| commit | f6e827ca75453f8769d725056460194c55c95696 (patch) | |
| tree | 22cce8b0a7c1eb8d459b1233105566e5e28daf90 /templates | |
| parent | 78cf4a8b56393358a6383d258bc237e481b7b323 (diff) | |
| parent | 197e4d4bfcb5a312a699e1f6d012da03ee36fbe2 (diff) | |
Merge branch 'master' of https://github.com/kaernyk/vichan
Conflicts:
stylesheets/style.css
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/index.html | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/templates/index.html b/templates/index.html index 105d1584..8c4c278d 100644 --- a/templates/index.html +++ b/templates/index.html @@ -87,6 +87,5 @@ ready(); {% endraw %}</script> - <script src="js/threadscroll.js"></script> </body> </html> |