summaryrefslogtreecommitdiff
path: root/app/assets/images
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-01-22 15:33:06 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-01-22 15:33:06 +0100
commit39aa7132ceed3d4beab3a9b828e571bbfc67c07e (patch)
tree6c88289c9f99be0af8635636fcdf64102090e5ec /app/assets/images
parent5ad8203ce4f1bfea997960d0b52c626dea24b944 (diff)
parent6f69c1a85055ec7c2515719d79d2a7a4e60cec50 (diff)
Merge branch 'develop'5.1-beta1
Diffstat (limited to 'app/assets/images')
-rw-r--r--app/assets/images/amooma-logo.pngbin1314 -> 0 bytes
-rw-r--r--app/assets/images/bg-body.pngbin1768 -> 0 bytes
-rw-r--r--app/assets/images/gradients/light-to-dark-blue-x63.pngbin187 -> 0 bytes
-rw-r--r--app/assets/images/gradients/white-gray-x29-reverse.pngbin123 -> 0 bytes
-rw-r--r--app/assets/images/gradients/white-gray-x29.pngbin126 -> 0 bytes
-rw-r--r--app/assets/images/gradients/white-texture-x63.pngbin6927 -> 0 bytes
-rw-r--r--app/assets/images/icons/glyphicons-halflings-white.pngbin0 -> 8777 bytes
-rw-r--r--app/assets/images/icons/glyphicons-halflings.pngbin0 -> 12799 bytes
-rw-r--r--app/assets/images/logo.pngbin7490 -> 0 bytes
-rw-r--r--app/assets/images/phones/snom/Visio_snom300.pngbin0 -> 51018 bytes
-rw-r--r--app/assets/images/phones/snom/Visio_snom320.pngbin0 -> 66491 bytes
-rw-r--r--app/assets/images/phones/snom/Visio_snom360.pngbin0 -> 68592 bytes
-rw-r--r--app/assets/images/phones/snom/Visio_snom370.pngbin0 -> 68924 bytes
-rw-r--r--app/assets/images/phones/snom/Visio_snom820.pngbin0 -> 60875 bytes
-rw-r--r--app/assets/images/phones/snom/Visio_snom821.pngbin0 -> 60875 bytes
-rw-r--r--app/assets/images/phones/snom/Visio_snom870.pngbin0 -> 59457 bytes
-rw-r--r--app/assets/images/stubs/user-36x.jpgbin2093 -> 0 bytes
-rw-r--r--app/assets/images/user.pngbin4800 -> 0 bytes
18 files changed, 0 insertions, 0 deletions
diff --git a/app/assets/images/amooma-logo.png b/app/assets/images/amooma-logo.png
deleted file mode 100644
index 11096ff..0000000
--- a/app/assets/images/amooma-logo.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/images/bg-body.png b/app/assets/images/bg-body.png
deleted file mode 100644
index 777eff6..0000000
--- a/app/assets/images/bg-body.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/images/gradients/light-to-dark-blue-x63.png b/app/assets/images/gradients/light-to-dark-blue-x63.png
deleted file mode 100644
index 7eb020f..0000000
--- a/app/assets/images/gradients/light-to-dark-blue-x63.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/images/gradients/white-gray-x29-reverse.png b/app/assets/images/gradients/white-gray-x29-reverse.png
deleted file mode 100644
index 7b7e879..0000000
--- a/app/assets/images/gradients/white-gray-x29-reverse.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/images/gradients/white-gray-x29.png b/app/assets/images/gradients/white-gray-x29.png
deleted file mode 100644
index a1671d0..0000000
--- a/app/assets/images/gradients/white-gray-x29.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/images/gradients/white-texture-x63.png b/app/assets/images/gradients/white-texture-x63.png
deleted file mode 100644
index 1576e8f..0000000
--- a/app/assets/images/gradients/white-texture-x63.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/images/icons/glyphicons-halflings-white.png b/app/assets/images/icons/glyphicons-halflings-white.png
new file mode 100644
index 0000000..3bf6484
--- /dev/null
+++ b/app/assets/images/icons/glyphicons-halflings-white.png
Binary files differ
diff --git a/app/assets/images/icons/glyphicons-halflings.png b/app/assets/images/icons/glyphicons-halflings.png
new file mode 100644
index 0000000..a996999
--- /dev/null
+++ b/app/assets/images/icons/glyphicons-halflings.png
Binary files differ
diff --git a/app/assets/images/logo.png b/app/assets/images/logo.png
deleted file mode 100644
index e4432b8..0000000
--- a/app/assets/images/logo.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/images/phones/snom/Visio_snom300.png b/app/assets/images/phones/snom/Visio_snom300.png
new file mode 100644
index 0000000..42e7a87
--- /dev/null
+++ b/app/assets/images/phones/snom/Visio_snom300.png
Binary files differ
diff --git a/app/assets/images/phones/snom/Visio_snom320.png b/app/assets/images/phones/snom/Visio_snom320.png
new file mode 100644
index 0000000..9e91a57
--- /dev/null
+++ b/app/assets/images/phones/snom/Visio_snom320.png
Binary files differ
diff --git a/app/assets/images/phones/snom/Visio_snom360.png b/app/assets/images/phones/snom/Visio_snom360.png
new file mode 100644
index 0000000..aeb9115
--- /dev/null
+++ b/app/assets/images/phones/snom/Visio_snom360.png
Binary files differ
diff --git a/app/assets/images/phones/snom/Visio_snom370.png b/app/assets/images/phones/snom/Visio_snom370.png
new file mode 100644
index 0000000..e900b34
--- /dev/null
+++ b/app/assets/images/phones/snom/Visio_snom370.png
Binary files differ
diff --git a/app/assets/images/phones/snom/Visio_snom820.png b/app/assets/images/phones/snom/Visio_snom820.png
new file mode 100644
index 0000000..3ec75c7
--- /dev/null
+++ b/app/assets/images/phones/snom/Visio_snom820.png
Binary files differ
diff --git a/app/assets/images/phones/snom/Visio_snom821.png b/app/assets/images/phones/snom/Visio_snom821.png
new file mode 100644
index 0000000..3ec75c7
--- /dev/null
+++ b/app/assets/images/phones/snom/Visio_snom821.png
Binary files differ
diff --git a/app/assets/images/phones/snom/Visio_snom870.png b/app/assets/images/phones/snom/Visio_snom870.png
new file mode 100644
index 0000000..1550591
--- /dev/null
+++ b/app/assets/images/phones/snom/Visio_snom870.png
Binary files differ
diff --git a/app/assets/images/stubs/user-36x.jpg b/app/assets/images/stubs/user-36x.jpg
deleted file mode 100644
index 8a391a0..0000000
--- a/app/assets/images/stubs/user-36x.jpg
+++ /dev/null
Binary files differ
diff --git a/app/assets/images/user.png b/app/assets/images/user.png
deleted file mode 100644
index c0e33c7..0000000
--- a/app/assets/images/user.png
+++ /dev/null
Binary files differ