web/cryptpad
Archived
5
0 Fork 0
Code Issues 1 Actions Releases Wiki Activity

resolve merge

Browse Source
This commit is contained in:
ansuz committed 2017-07-23 14:31:13 +02:00
2 parents dcf5719eaf 5c07eac4de
commit 2e3be27278
2 files changed
+4 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

www/todo/index.html
+1
View File
@@ -1,3 +1,4 @@
<<<<<<< HEAD
<!DOCTYPE html>
<html class="cp pad">
<head>