diff options
| author | kwadronaut <kwadronaut@leap.se> | 2013-11-24 12:30:07 +0100 |
|---|---|---|
| committer | kwadronaut <kwadronaut@leap.se> | 2013-11-24 12:30:07 +0100 |
| commit | ff44bc75b814700f65459f990bfb6c078c876483 (patch) | |
| tree | ec42a235c944c31c6886d67baeebe72affb1a4d6 /files/webapp/public | |
| parent | 478d964b79d3f72d233fa2e53d2c00dbc6f05a96 (diff) | |
| parent | c73f755a3db36bf9eea411bae91da5e84f158cdc (diff) | |
Merge branch 'develop'
Conflicts:
Leapfile
files/ssh/authorized_keys
Diffstat (limited to 'files/webapp/public')
| -rw-r--r-- | files/webapp/public/favicon.ico | bin | 0 -> 1150 bytes |
| -rw-r--r-- | files/webapp/public/img/leap-small.png | bin | 0 -> 10100 bytes |
| -rw-r--r-- | files/webapp/public/img/mask-big.png | bin | 0 -> 12951 bytes |
| -rw-r--r-- | files/webapp/public/img/rainbow-masthead-small.png | bin | 0 -> 42639 bytes |
| -rw-r--r-- | files/webapp/public/img/rainbow-masthead.png | bin | 0 -> 121200 bytes |
5 files changed, 0 insertions, 0 deletions
diff --git a/files/webapp/public/favicon.ico b/files/webapp/public/favicon.ico Binary files differnew file mode 100644 index 0000000..7f41dd1 --- /dev/null +++ b/files/webapp/public/favicon.ico diff --git a/files/webapp/public/img/leap-small.png b/files/webapp/public/img/leap-small.png Binary files differnew file mode 100644 index 0000000..bc9d4e7 --- /dev/null +++ b/files/webapp/public/img/leap-small.png diff --git a/files/webapp/public/img/mask-big.png b/files/webapp/public/img/mask-big.png Binary files differnew file mode 100644 index 0000000..2e69402 --- /dev/null +++ b/files/webapp/public/img/mask-big.png diff --git a/files/webapp/public/img/rainbow-masthead-small.png b/files/webapp/public/img/rainbow-masthead-small.png Binary files differnew file mode 100644 index 0000000..e47eac5 --- /dev/null +++ b/files/webapp/public/img/rainbow-masthead-small.png diff --git a/files/webapp/public/img/rainbow-masthead.png b/files/webapp/public/img/rainbow-masthead.png Binary files differnew file mode 100644 index 0000000..26319d5 --- /dev/null +++ b/files/webapp/public/img/rainbow-masthead.png |
