diff options
author | Sven Willner <sven.willner@gmail.com> | 2019-04-01 13:58:50 +0200 |
---|---|---|
committer | Sven Willner <sven.willner@gmail.com> | 2019-04-01 13:58:50 +0200 |
commit | a9ffd5d2234433bc3f3829713b0968a1d6c13b94 (patch) | |
tree | 78a78930edbf7c187e0803f367529f2aabc90627 /cam/cam_bookmarks | |
parent | 1d3d1259590c8a600c3d800942ab5566802d3499 (diff) | |
parent | 18dd1c5ea218c1b86e305d3ee0052335b1e22fc8 (diff) |
Merge remote-tracking branch 'original/master'
Diffstat (limited to 'cam/cam_bookmarks')
-rw-r--r-- | cam/cam_bookmarks | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/cam/cam_bookmarks b/cam/cam_bookmarks deleted file mode 100644 index 8d45413..0000000 --- a/cam/cam_bookmarks +++ /dev/null @@ -1,2 +0,0 @@ -nasa_shuttle=60,http://science.ksc.nasa.gov/shuttle/countdown/video/chan2large.jpg - |