diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-02-25 20:21:45 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-02-25 20:21:45 +0300 |
| commit | a52529f9b6258b2ae2793930096c3fcbe40078f3 (patch) | |
| tree | fc28baed1a41a50892215c94ccee3f2eddf9772c /app/assets/images | |
| parent | 7475f4f00d999a603eb01a0b70a966db1cd243d8 (diff) | |
| parent | 56f51bed6b166f12b8b0f4f1bd883142c5e079a6 (diff) | |
Merge branch 'bitbucket-import'
Conflicts:
app/views/import/gitorious/status.html.haml
db/schema.rb
Diffstat (limited to 'app/assets/images')
| -rw-r--r-- | app/assets/images/authbuttons/bitbucket_32.png | bin | 0 -> 2713 bytes |
| -rw-r--r-- | app/assets/images/authbuttons/bitbucket_64.png | bin | 0 -> 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 Binary files differnew file mode 100644 index 00000000000..27702eb973d --- /dev/null +++ b/app/assets/images/authbuttons/bitbucket_32.png diff --git a/app/assets/images/authbuttons/bitbucket_64.png b/app/assets/images/authbuttons/bitbucket_64.png Binary files differnew file mode 100644 index 00000000000..4b90a57bc7d --- /dev/null +++ b/app/assets/images/authbuttons/bitbucket_64.png |
