saurabh
/
orbit-basic
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit 

Conflicts:
	Gemfile.lock
	vendor/built_in_modules/calendar/app/assets/stylesheets/calendar.css
	vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/month_view.html.erb
	vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/week_view.html.erb
This commit is contained in:
Christophe Vilayphiou 2012-09-14 16:05:04 +08:00
parent af19f11668 17768867a5
commit 619ae7e260
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/month_view.html.erb vendored
View File

@ -87,7 +87,7 @@
</tr> </tr>
<tr> <tr>
<td colspan="3"></td> <td colspan="3"></td>
<td><div class="event" style="color: #ffcc00;">7pm - 9pm test event</div></td> <td><div class="event single" style="color: #ffcc00;">7pm - 9pm test event</div></td>
<td colspan="3"></td> <td colspan="3"></td>
</tr> </tr>
</table> </table>