kvazar/webapp
1
0
Fork 0
mirror of https://github.com/kvazar-network/webapp.git synced 2025-02-09 13:44:18 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into sqlite

Browse Source
This commit is contained in:
d47081 2023-03-14 02:17:40 +02:00
commit 69940064f9
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -1,3 +1,4 @@
<<<<<<< HEAD
# kvazar-network webapp # kvazar-network webapp
Web-oriented content exploring platform for Kevacoin Blockchain Web-oriented content exploring platform for Kevacoin Blockchain
@ -45,3 +46,5 @@ location @sef {
#### yggdrasil #### yggdrasil
[http://[203:9fd0:95df:54d7:29db:5ee1:fe2d:95c7]](http://[203:9fd0:95df:54d7:29db:5ee1:fe2d:95c7]) [http://[203:9fd0:95df:54d7:29db:5ee1:fe2d:95c7]](http://[203:9fd0:95df:54d7:29db:5ee1:fe2d:95c7])
=======
>>>>>>> master

3
public/index.php Executable file → Normal file
View File

@ -1,3 +1,4 @@
<<<<<<< HEAD
<?php <?php
require_once('../config.php'); require_once('../config.php');
@ -169,3 +170,5 @@ if ($rss) {
require_once('index.phtml'); require_once('index.phtml');
} }
=======
>>>>>>> master