diff options
| author | Felipe Artur <felipefac@gmail.com> | 2016-06-17 12:38:49 -0300 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2016-06-17 14:29:11 -0300 |
| commit | e5aa902860fcc2380fd25a6a4f0736dae159eba3 (patch) | |
| tree | ba3c678a476bc7153490da412ebd64223c155c1c /app/views/shared/notifications | |
| parent | ab236c76247d83c190b148acbffa48f244414553 (diff) | |
| parent | ae4491b42181f7195199fd6ac9273891d6e48263 (diff) | |
| download | gitlab-ce-e5aa902860fcc2380fd25a6a4f0736dae159eba3.tar.gz | |
Merge master into issue_12758issue_12758
Diffstat (limited to 'app/views/shared/notifications')
| -rw-r--r-- | app/views/shared/notifications/_button.html.haml (renamed from app/views/shared/notifications/buttons/_button.html.haml) | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/app/views/shared/notifications/buttons/_button.html.haml b/app/views/shared/notifications/_button.html.haml index ff1cf966a9b..ff1cf966a9b 100644 --- a/app/views/shared/notifications/buttons/_button.html.haml +++ b/app/views/shared/notifications/_button.html.haml |