Commit Graph

8 Commits

Author SHA1 Message Date
Yukimi Kazari
7277a3434f Revert "Merge branch 'testing' into 'master'"
This reverts commit 04c65079d2
2017-01-25 06:42:14 -05:00
Yukimi Kazari
04c65079d2 Merge branch 'testing' into 'master'
# Conflicts:
#   app/views/post/show_partials/_statistics_panel.php
2017-01-25 06:31:37 -05:00
Yukimi Kazari
a9df296015 Profile photo in stats bar 2016-12-17 11:06:19 -05:00
Yukimi Kazari
18742e0d51 Dev - User Image in Sidebar 2016-12-02 02:02:17 -05:00
Yukimi Kazari
2b6d478b54 TESTING - No Sidebar 2016-09-19 01:54:32 -04:00
Yukimi Kazari
16003af8d7 TESTING - Menu 2016-09-17 15:14:52 -04:00
Yuki K
7c1ab41a92 TESTING - Moved Post Elements and such 2016-09-15 01:32:51 -04:00
Parziphal
13227f0bca added files 2013-10-26 18:06:58 -05:00