diff options
| author | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-04-01 13:55:50 -0500 |
|---|---|---|
| committer | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-04-07 15:33:18 -0700 |
| commit | 3cfeb3755828871813cd12c771fa7efddf67edb5 (patch) | |
| tree | 31e6adca5ef583ecc09a3adbe667ee43f6ed18f0 /app/assets/stylesheets/framework/buttons.scss | |
| parent | 87b3c73ea560d6091a17e7b759864b90911f5f1c (diff) | |
| download | gitlab-ce-3cfeb3755828871813cd12c771fa7efddf67edb5.tar.gz | |
Merge conflict fixes
Diffstat (limited to 'app/assets/stylesheets/framework/buttons.scss')
0 files changed, 0 insertions, 0 deletions