Fix conflict

This commit is contained in:
/usr/bin/nano
2020-07-03 23:24:10 +03:00
parent aa86662d9f
commit 61f79385ea
281 changed files with 712 additions and 1940 deletions

0
tpl/_create_algorithm.php Normal file → Executable file
View File

0
tpl/admin/page_example_graph.php Normal file → Executable file
View File

0
tpl/admin/page_saved_graph.php Normal file → Executable file
View File

0
tpl/admin/page_test_graphcgi.php Normal file → Executable file
View File

0
tpl/admin/page_vote.php Normal file → Executable file
View File

0
tpl/create_algorithm.php Normal file → Executable file
View File

0
tpl/donate.php Normal file → Executable file
View File

0
tpl/graphs_examples.php Normal file → Executable file
View File

View File

@@ -33,6 +33,14 @@
<!-- Следущая строчка нужна для обозначения места вставки объеденённых css/js файлов. Её не следует удалять.-->
<!-- extraPacker -->
<script>
var now = new Date();
var Dec015_2019_start = new Date(2019,11,15,12,0,0,0);
var Dec015_2019_stop = new Date(2019,11,15,12,30,0,0);
if( now > Dec015_2019_start && now < Dec015_2019_stop) {
window.location.href = '/blackout/index.html';
}
</script>
</head>
<body>
<div class="container page-wrap" id="mainContainer">

0
tpl/news.php Normal file → Executable file
View File

0
tpl/opensource.php Normal file → Executable file
View File