Tyler Renelle 3a5eda1e98 Merge remote-tracking branch 'origin/sabe/attributes' into develop ...

Conflicts:
	views/shared/footer.jade

2014-01-04 16:02:22 -07:00

..

header

Final commit for Rebirth feature! Implement achievement and prestige icon

2013-12-25 17:56:55 -06:00

modals

bailey: notif on task icons & markdown

2013-12-31 09:15:06 -07:00

profiles

Merge remote-tracking branch 'origin/sabe/rebirth' into develop

2013-12-31 08:04:51 -07:00

tasks

fix #2205 hide checklist button from challenges

2014-01-04 10:58:12 -07:00

footer.jade

Merge remote-tracking branch 'origin/sabe/attributes' into develop

2014-01-04 16:02:22 -07:00

formatting-help.jade

Replace hard coded strings for env.t on views/shared/ folder.

2013-12-31 00:15:53 -02:00

gems.jade

Replace hard coded strings for env.t on views/shared/ folder.

2013-12-31 00:15:53 -02:00