Merge branch 'master' of https://www.profiteroles.org/git/p/Rollup

Update
2019-09-29 16:43:15 -07:00 · 2019-09-29 16:42:41 -07:00 · 2019-09-29 16:35:52 -07:00 · 2019-09-29 16:35:37 -07:00
14 changed files with 2 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+.DS_Store
--- a/icon.icns
+++ b/icon.icns
--- a/icon.iconset/icon_128x128.png
+++ b/icon.iconset/icon_128x128.png
--- a/icon.iconset/icon_128x128@2x.png
+++ b/icon.iconset/icon_128x128@2x.png
--- a/icon.iconset/icon_16x16.png
+++ b/icon.iconset/icon_16x16.png
--- a/icon.iconset/icon_16x16@2x.png
+++ b/icon.iconset/icon_16x16@2x.png
--- a/icon.iconset/icon_256x256.png
+++ b/icon.iconset/icon_256x256.png
--- a/icon.iconset/icon_256x256@2x.png
+++ b/icon.iconset/icon_256x256@2x.png
--- a/icon.iconset/icon_32x32.png
+++ b/icon.iconset/icon_32x32.png
--- a/icon.iconset/icon_32x32@2x.png
+++ b/icon.iconset/icon_32x32@2x.png
--- a/icon.iconset/icon_512x512.png
+++ b/icon.iconset/icon_512x512.png
--- a/icon.iconset/icon_512x512@2x.png
+++ b/icon.iconset/icon_512x512@2x.png
--- a/icon.png
+++ b/icon.png
Author	SHA1	Message	Date
p	57dc3388d9	Merge branch 'master' of https://www.profiteroles.org/git/p/Rollup	2019-09-29 16:43:15 -07:00
p	86a0a63baa	Update	2019-09-29 16:42:41 -07:00
profiteroles	a7d8b12eca	Update	2019-09-29 16:35:52 -07:00
profiteroles	4f65bba2e3	Update	2019-09-29 16:35:37 -07:00