summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-02-25 09:21:45 -0800
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-02-25 09:21:45 -0800
commita52529f9b6258b2ae2793930096c3fcbe40078f3 (patch)
treefc28baed1a41a50892215c94ccee3f2eddf9772c /app/assets
parent7475f4f00d999a603eb01a0b70a966db1cd243d8 (diff)
parent56f51bed6b166f12b8b0f4f1bd883142c5e079a6 (diff)
downloadgitlab-ce-a52529f9b6258b2ae2793930096c3fcbe40078f3.tar.gz
Merge branch 'bitbucket-import'
Conflicts: app/views/import/gitorious/status.html.haml db/schema.rb
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/images/authbuttons/bitbucket_32.pngbin0 -> 2713 bytes
-rw-r--r--app/assets/images/authbuttons/bitbucket_64.pngbin0 -> 2163 bytes
2 files changed, 0 insertions, 0 deletions
diff --git a/app/assets/images/authbuttons/bitbucket_32.png b/app/assets/images/authbuttons/bitbucket_32.png
new file mode 100644
index 00000000000..27702eb973d
--- /dev/null
+++ b/app/assets/images/authbuttons/bitbucket_32.png
Binary files differ
diff --git a/app/assets/images/authbuttons/bitbucket_64.png b/app/assets/images/authbuttons/bitbucket_64.png
new file mode 100644
index 00000000000..4b90a57bc7d
--- /dev/null
+++ b/app/assets/images/authbuttons/bitbucket_64.png
Binary files differ