Skip to content

Commit

Permalink
Merge branch '0.7'
Browse files Browse the repository at this point in the history
Conflicts:
	js/clipboard.js
  • Loading branch information
leizh committed Jan 31, 2018
2 parents 479ac72 + 2249759 commit 850bbde
Show file tree
Hide file tree
Showing 6 changed files with 203 additions and 251 deletions.
55 changes: 0 additions & 55 deletions ajax/clipboard.php

This file was deleted.

2 changes: 1 addition & 1 deletion appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<name>Files clipboard</name>
<summary>Clipboard operations for the files application</summary>
<description>Minimal clipboard feature for the files application. Allows to copy and move files between directories.</description>
<version>0.6.5</version>
<version>0.7.1</version>
<licence>AGPL</licence>
<author>Leizh</author>
<category>tools</category>
Expand Down
2 changes: 0 additions & 2 deletions appinfo/routes.php

This file was deleted.

2 changes: 1 addition & 1 deletion appinfo/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.6.5
0.7.1
3 changes: 0 additions & 3 deletions img/app.svg

This file was deleted.

Loading

0 comments on commit 850bbde

Please sign in to comment.